[mlpack-svn] r13789 - mlpack/trunk/src/mlpack/core/optimizers/lbfgs

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

Author: rcurtin
Date: 2012-10-30 18:03:19 -0400 (Tue, 30 Oct 2012)
New Revision: 13789

Modified:
   mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp
   mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp
Log:
Fix a few errors in these files.


Modified: mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp	2012-10-30 20:56:23 UTC (rev 13788)
+++ mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp	2012-10-30 22:03:19 UTC (rev 13789)
@@ -175,8 +175,8 @@
 double GeneralizedRosenbrockFunction::Evaluate(const arma::mat& coordinates,
                                                const size_t i) const
 {
-  return 100 * std::pow(std::pow(coordinates[i], 3) - coordinates[i] *
-      coordinates[i + 1]) + 2 * (coordinates[i] - 1);
+  return 100 * std::pow((std::pow(coordinates[i], 2) - coordinates[i + 1]), 2) +
+      std::pow(1 - coordinates[i], 2);
 }
 
 //! Calculate the gradient of one of the individual functions.
@@ -186,9 +186,9 @@
 {
   gradient.zeros(n);
 
-  gradient[i] = 400 * std::pow(coordinates[i], 3) + (2 + coordinates[i + 1]) *
-      coordinates[i] - 2;
-  gradient[i + 1] = 200 * (std::pow(coordinates[i], 2) + coordinates[i + 1]);
+  gradient[i] = 400 * (std::pow(coordinates[i], 3) - coordinates[i] *
+      coordinates[i + 1]) + 2 * (coordinates[i] - 1);
+  gradient[i + 1] = 200 * (coordinates[i + 1] - std::pow(coordinates[i], 2));
 }
 
 const arma::mat& GeneralizedRosenbrockFunction::GetInitialPoint() const

Modified: mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp	2012-10-30 20:56:23 UTC (rev 13788)
+++ mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp	2012-10-30 22:03:19 UTC (rev 13789)
@@ -156,4 +156,4 @@
 }; // namespace optimization
 }; // namespace mlpack
 
-#endif // __MLPAC_CORE_OPTIMIZERS_LBFGS_TEST_FUNCTIONS_HPP
+#endif // __MLPACK_CORE_OPTIMIZERS_LBFGS_TEST_FUNCTIONS_HPP