[mlpack] 62/149: Fix -Wreorder warnings after reordering of data members in class declaration.

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit 45463dd61e74e5ad609ca76b05c863a586676320
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Mon Nov 3 16:11:42 2014 +0000

    Fix -Wreorder warnings after reordering of data members in class declaration.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17282 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 src/mlpack/methods/hmm/hmm_impl.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mlpack/methods/hmm/hmm_impl.hpp b/src/mlpack/methods/hmm/hmm_impl.hpp
index 8e45479..a9cc351 100644
--- a/src/mlpack/methods/hmm/hmm_impl.hpp
+++ b/src/mlpack/methods/hmm/hmm_impl.hpp
@@ -23,9 +23,9 @@ template<typename Distribution>
 HMM<Distribution>::HMM(const size_t states,
                        const Distribution emissions,
                        const double tolerance) :
+    emission(states, /* default distribution */ emissions),
     initial(arma::ones<arma::vec>(states) / (double) states),
     transition(arma::ones<arma::mat>(states, states) / (double) states),
-    emission(states, /* default distribution */ emissions),
     dimensionality(emissions.Dimensionality()),
     tolerance(tolerance)
 { /* nothing to do */ }
@@ -39,9 +39,9 @@ HMM<Distribution>::HMM(const arma::vec& initial,
                        const arma::mat& transition,
                        const std::vector<Distribution>& emission,
                        const double tolerance) :
+    emission(emission),
     initial(initial),
     transition(transition),
-    emission(emission),
     tolerance(tolerance)
 {
   // Set the dimensionality, if we can.
@@ -447,12 +447,12 @@ void HMM<Distribution>::Filter(const arma::mat& dataSeq,
   arma::mat forwardProb;
   arma::vec scales;
   Forward(dataSeq, scales, forwardProb);
-  
+
   // Propagate state ahead
   if(ahead != 0) {
     forwardProb = pow(transition, ahead)*forwardProb;
   }
-  
+
   // Compute expected emissions.
   // Will not work for distributions without a Mean() function.
   filterSeq.zeros(dimensionality, dataSeq.n_cols);
@@ -472,7 +472,7 @@ void HMM<Distribution>::Smooth(const arma::mat& dataSeq,
   // First run the forward algorithm
   arma::mat stateProb;
   Estimate(dataSeq, stateProb);
-  
+
   // Compute expected emissions.
   // Will not work for distributions without a Mean() function.
   smoothSeq.zeros(dimensionality, dataSeq.n_cols);
@@ -580,7 +580,7 @@ void HMM<Distribution>::Save(util::SaveRestoreUtility& sr) const
   sr.SaveParameter(dimensionality, "dimensionality");
   sr.SaveParameter(transition.n_rows, "states");
   sr.SaveParameter(transition, "transition");
-  
+
   // Now the emissions.
   util::SaveRestoreUtility mn;
   for (size_t i = 0; i < transition.n_rows; ++i)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git