[mlpack] 63/149: Minor formatting changes and streamlining of Armadillo expressions.

[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 5eb8c408d931ac5b8c62797a10807149e848a417
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Mon Nov 3 16:16:08 2014 +0000

    Minor formatting changes and streamlining of Armadillo expressions.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17283 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 src/mlpack/methods/hmm/hmm_impl.hpp | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/mlpack/methods/hmm/hmm_impl.hpp b/src/mlpack/methods/hmm/hmm_impl.hpp
index a9cc351..f352656 100644
--- a/src/mlpack/methods/hmm/hmm_impl.hpp
+++ b/src/mlpack/methods/hmm/hmm_impl.hpp
@@ -443,23 +443,20 @@ void HMM<Distribution>::Filter(const arma::mat& dataSeq,
                                arma::mat& filterSeq,
                                size_t ahead) const
 {
-  // First run the forward algorithm
+  // First run the forward algorithm.
   arma::mat forwardProb;
   arma::vec scales;
   Forward(dataSeq, scales, forwardProb);
 
-  // Propagate state ahead
-  if(ahead != 0) {
-    forwardProb = pow(transition, ahead)*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);
-  for(size_t i = 0; i < emission.size(); i++)
-  {
-    filterSeq = filterSeq + (emission[i].Mean())*(forwardProb.row(i));
-  }
+  for (size_t i = 0; i < emission.size(); i++)
+    filterSeq += emission[i].Mean() * forwardProb.row(i);
 }
 
 /**
@@ -469,17 +466,15 @@ template<typename Distribution>
 void HMM<Distribution>::Smooth(const arma::mat& dataSeq,
                                arma::mat& smoothSeq) const
 {
-  // First run the forward algorithm
+  // 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);
-  for(size_t i = 0; i < emission.size(); i++)
-  {
-    smoothSeq = smoothSeq + (emission[i].Mean())*(stateProb.row(i));
-  }
+  for (size_t i = 0; i < emission.size(); i++)
+    smoothSeq += emission[i].Mean() * stateProb.row(i);
 }
 
 /**

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