[mlpack-svn] r15429 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Sun Jul 7 23:57:32 EDT 2013
Author: rcurtin
Date: Sun Jul 7 23:57:31 2013
New Revision: 15429
Log:
This should fix the failing build on old Armadillo versions.
Modified:
mlpack/trunk/src/mlpack/tests/metric_test.cpp
Modified: mlpack/trunk/src/mlpack/tests/metric_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/metric_test.cpp (original)
+++ mlpack/trunk/src/mlpack/tests/metric_test.cpp Sun Jul 7 23:57:31 2013
@@ -75,11 +75,11 @@
ChebyshevDistance lMetric;
- BOOST_REQUIRE_CLOSE((double) arma::max(arma::abs(a1 - b1)),
- lMetric.Evaluate(a1, b1), 1e-5);
+ BOOST_REQUIRE_CLOSE((double) arma::as_scalar(arma::max(arma::abs(a1 - b1)),
+ lMetric.Evaluate(a1, b1), 1e-5));
- BOOST_REQUIRE_CLOSE((double) arma::max(arma::abs(a2 - b2)),
- lMetric.Evaluate(a2, b2), 1e-5);
+ BOOST_REQUIRE_CLOSE((double) arma::as_scalar(arma::max(arma::abs(a2 - b2)),
+ lMetric.Evaluate(a2, b2), 1e-5));
}
BOOST_AUTO_TEST_SUITE_END();
More information about the mlpack-svn
mailing list