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

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

Author: rcurtin
Date: 2012-02-10 12:54:51 -0500 (Fri, 10 Feb 2012)
New Revision: 11458

Modified:
   mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp
   mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp
Log:
Update for new L-BFGS API.


Modified: mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp	2012-02-10 17:38:38 UTC (rev 11457)
+++ mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp	2012-02-10 17:54:51 UTC (rev 11458)
@@ -1,9 +1,9 @@
 /**
- * @file aug_lagrangian_test.cc
+ * @file aug_lagrangian_test.cpp
  * @author Ryan Curtin
  *
  * Test of the AugmentedLagrangian class using the test functions defined in
- * aug_lagrangian_test_functions.h.
+ * aug_lagrangian_test_functions.hpp.
  */
 
 #include <mlpack/core.hpp>
@@ -24,7 +24,7 @@
 {
   // The choice of 10 memory slots is arbitrary.
   AugLagrangianTestFunction f;
-  AugLagrangian<AugLagrangianTestFunction> aug(f, 10);
+  AugLagrangian<AugLagrangianTestFunction> aug(f);
 
   arma::vec coords = f.GetInitialPoint();
 
@@ -44,7 +44,7 @@
 BOOST_AUTO_TEST_CASE(GockenbachFunctionTest)
 {
   GockenbachFunction f;
-  AugLagrangian<GockenbachFunction> aug(f, 10);
+  AugLagrangian<GockenbachFunction> aug(f);
 
   arma::vec coords = f.GetInitialPoint();
 
@@ -53,10 +53,11 @@
 
   double finalValue = f.Evaluate(coords);
 
+  // Higher tolerance for smaller values.
   BOOST_REQUIRE_CLOSE(finalValue, 29.633926, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[0], 0.12288178, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[0], 0.12288178, 1e-3);
   BOOST_REQUIRE_CLOSE(coords[1], -1.10778185, 1e-5);
-  BOOST_REQUIRE_CLOSE(coords[2], 0.015099932, 1e-5);
+  BOOST_REQUIRE_CLOSE(coords[2], 0.015099932, 1e-3);
 }
 
 BOOST_AUTO_TEST_SUITE_END();

Modified: mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp	2012-02-10 17:38:38 UTC (rev 11457)
+++ mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp	2012-02-10 17:54:51 UTC (rev 11458)
@@ -15,17 +15,17 @@
 using namespace mlpack::optimization::test;
 
 BOOST_AUTO_TEST_SUITE(LBFGSTest);
-#ifdef FOOBAR
+
 /**
  * Tests the L-BFGS optimizer using the Rosenbrock Function.
  */
 BOOST_AUTO_TEST_CASE(RosenbrockFunction)
 {
   RosenbrockFunction f;
-  L_BFGS<RosenbrockFunction> lbfgs(f, 10);
+  L_BFGS<RosenbrockFunction> lbfgs(f);
 
   arma::vec coords = f.GetInitialPoint();
-  if (!lbfgs.Optimize(0, coords))
+  if (!lbfgs.Optimize(coords))
     BOOST_FAIL("L-BFGS optimization reported failure.");
 
   double finalValue = f.Evaluate(coords);
@@ -41,10 +41,10 @@
 BOOST_AUTO_TEST_CASE(WoodFunction)
 {
   WoodFunction f;
-  L_BFGS<WoodFunction> lbfgs(f, 10);
+  L_BFGS<WoodFunction> lbfgs(f);
 
   arma::vec coords = f.GetInitialPoint();
-  if (!lbfgs.Optimize(0, coords))
+  if (!lbfgs.Optimize(coords))
     BOOST_FAIL("L-BFGS optimization reported failure.");
 
   double finalValue = f.Evaluate(coords);
@@ -72,7 +72,7 @@
     L_BFGS<GeneralizedRosenbrockFunction> lbfgs(f, 20);
 
     arma::vec coords = f.GetInitialPoint();
-    if (!lbfgs.Optimize(0, coords))
+    if (!lbfgs.Optimize(coords))
       BOOST_FAIL("L-BFGS optimization reported failure.");
 
     double finalValue = f.Evaluate(coords);
@@ -91,10 +91,10 @@
 BOOST_AUTO_TEST_CASE(RosenbrockWoodFunction)
 {
   RosenbrockWoodFunction f;
-  L_BFGS<RosenbrockWoodFunction> lbfgs(f, 10);
+  L_BFGS<RosenbrockWoodFunction> lbfgs(f);
 
   arma::mat coords = f.GetInitialPoint();
-  if (!lbfgs.Optimize(0, coords))
+  if (!lbfgs.Optimize(coords))
     BOOST_FAIL("L-BFGS optimization reported failure.");
 
   double finalValue = f.Evaluate(coords);
@@ -106,5 +106,5 @@
     BOOST_REQUIRE_CLOSE((coords(row, 1)), 1, 1e-5);
   }
 }
-#endif
+
 BOOST_AUTO_TEST_SUITE_END();