[mlpack-svn] r15425 - mlpack/trunk/src/mlpack/tests

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

Author: pram
Date: Fri Jul  5 22:08:56 2013
New Revision: 15425

Log:
LBFGS test compilation failure fixed

Modified:
   mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp
   mlpack/trunk/src/mlpack/tests/metric_test.cpp

Modified: mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp	(original)
+++ mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp	Fri Jul  5 22:08:56 2013
@@ -33,8 +33,8 @@
   double finalValue = f.Evaluate(coords);
 
   BOOST_REQUIRE_SMALL(finalValue, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[0], 1, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[1], 1, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[0], 1.0, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[1], 1.0, 1e-5);
 }
 
 /**
@@ -53,10 +53,10 @@
   double finalValue = f.Evaluate(coords);
 
   BOOST_REQUIRE_SMALL(finalValue, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[0], 1, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[1], 1, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[2], 1, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[3], 1, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[0], 1.0, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[1], 1.0, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[2], 1.0, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[3], 1.0, 1e-5);
 }
 
 /**
@@ -84,7 +84,7 @@
     // Test the output to make sure it is correct.
     BOOST_REQUIRE_SMALL(finalValue, 1e-5);
     for (int j = 0; j < dim; j++)
-      BOOST_REQUIRE_CLOSE(coords[j], 1, 1e-5);
+      BOOST_REQUIRE_CLOSE(coords[j], 1.0, 1e-5);
   }
 }
 
@@ -107,8 +107,8 @@
   BOOST_REQUIRE_SMALL(finalValue, 1e-5);
   for (int row = 0; row < 4; row++)
   {
-    BOOST_REQUIRE_CLOSE((coords(row, 0)), 1, 1e-5);
-    BOOST_REQUIRE_CLOSE((coords(row, 1)), 1, 1e-5);
+    BOOST_REQUIRE_CLOSE((coords(row, 0)), 1.0, 1e-5);
+    BOOST_REQUIRE_CLOSE((coords(row, 1)), 1.0, 1e-5);
   }
 }
 

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	Fri Jul  5 22:08:56 2013
@@ -29,10 +29,10 @@
 
   ManhattanDistance lMetric;
 
-  BOOST_REQUIRE_CLOSE(arma::sum(arma::abs(a1 - b1)),
+  BOOST_REQUIRE_CLOSE((double) arma::sum(arma::abs(a1 - b1)),
                       lMetric.Evaluate(a1, b1), 1e-5);
 
-  BOOST_REQUIRE_CLOSE(arma::sum(arma::abs(a2 - b2)),
+  BOOST_REQUIRE_CLOSE((double) arma::sum(arma::abs(a2 - b2)),
                       lMetric.Evaluate(a2, b2), 1e-5);
 }
 
@@ -52,10 +52,10 @@
 
   EuclideanDistance lMetric;
 
-  BOOST_REQUIRE_CLOSE(sqrt(arma::sum(arma::square(a1 - b1))),
+  BOOST_REQUIRE_CLOSE((double) sqrt(arma::sum(arma::square(a1 - b1))),
                       lMetric.Evaluate(a1, b1), 1e-5);
 
-  BOOST_REQUIRE_CLOSE(sqrt(arma::sum(arma::square(a2 - b2))),
+  BOOST_REQUIRE_CLOSE((double) sqrt(arma::sum(arma::square(a2 - b2))),
                       lMetric.Evaluate(a2, b2), 1e-5);
 }
 
@@ -75,10 +75,10 @@
 
   EuclideanDistance lMetric;
 
-  BOOST_REQUIRE_CLOSE(arma::max(arma::abs(a1 - b1)),
+  BOOST_REQUIRE_CLOSE((double) arma::max(arma::abs(a1 - b1)),
                       lMetric.Evaluate(a1, b1), 1e-5);
 
-  BOOST_REQUIRE_CLOSE(arma::max(arma::abs(a2 - b2)),
+  BOOST_REQUIRE_CLOSE((double) arma::max(arma::abs(a2 - b2)),
                       lMetric.Evaluate(a2, b2), 1e-5);
 }