[mlpack-svn] r12342 - mlpack/trunk/src/mlpack/methods/gmm

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2012-04-12 11:54:18 -0400 (Thu, 12 Apr 2012)
New Revision: 12342

Modified:
   mlpack/trunk/src/mlpack/methods/gmm/phi.hpp
Log:
Workaround for Armadillo 3.0.0 bug.


Modified: mlpack/trunk/src/mlpack/methods/gmm/phi.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/gmm/phi.hpp	2012-04-12 15:53:22 UTC (rev 12341)
+++ mlpack/trunk/src/mlpack/methods/gmm/phi.hpp	2012-04-12 15:54:18 UTC (rev 12342)
@@ -56,7 +56,8 @@
 {
   arma::vec diff = mean - x;
 
-  arma::vec exponent = -0.5 * trans(diff) * inv(cov) * diff;
+  // Parentheses required for Armadillo 3.0.0 bug.
+  arma::vec exponent = -0.5 * (trans(diff) * inv(cov) * diff);
 
   // TODO: What if det(cov) < 0?
   return pow(2 * M_PI, (double) x.n_elem / -2.0) * pow(det(cov), -0.5) *
@@ -87,7 +88,8 @@
   arma::mat cinv = inv(cov);
 
   arma::vec diff = mean - x;
-  arma::vec exponent = -0.5 * trans(diff) * inv(cov) * diff;
+  // Parentheses required for Armadillo 3.0.0 bug.
+  arma::vec exponent = -0.5 * (trans(diff) * inv(cov) * diff);
 
   long double f = pow(2 * M_PI, (double) x.n_elem / 2) * pow(det(cov), -0.5)
       * exp(exponent[0]);