[mlpack-git] master: Use right call to chol() depending on Armadillo version. (e27f1e6)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Dec 23 19:12:20 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/bcabda77ee982d8c3512a5bf77f72fe10f1c5e09...0af5e8c8d98a42ce82232ceddc37609df7e7920d

>---------------------------------------------------------------

commit e27f1e68a1b7c035eb0283a44dc5142133526a12
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Dec 23 17:24:42 2015 -0500

    Use right call to chol() depending on Armadillo version.


>---------------------------------------------------------------

e27f1e68a1b7c035eb0283a44dc5142133526a12
 src/mlpack/tests/gmm_test.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mlpack/tests/gmm_test.cpp b/src/mlpack/tests/gmm_test.cpp
index 09df0ea..aa672fd 100644
--- a/src/mlpack/tests/gmm_test.cpp
+++ b/src/mlpack/tests/gmm_test.cpp
@@ -570,7 +570,13 @@ BOOST_AUTO_TEST_CASE(PositiveDefiniteConstraintTest)
     PositiveDefiniteConstraint::ApplyConstraint(cov);
 
     arma::mat c;
+    #if (ARMA_VERSION_MAJOR < 4) || \
+        ((ARMA_VERSION_MAJOR == 4) && (ARMA_VERSION_MINOR < 500))
     BOOST_REQUIRE(arma::chol(c, cov));
+    #else
+    BOOST_REQUIRE(arma::chol(c, cov, "lower"));
+    #endif
+
   }
 }
 



More information about the mlpack-git mailing list