[mlpack-svn] r11384 - mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Sat Feb 4 20:24:29 EST 2012
Author: rcurtin
Date: 2012-02-04 20:24:29 -0500 (Sat, 04 Feb 2012)
New Revision: 11384
Modified:
mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp
Log:
Limit on number of iterations, and set the first lambda value right for LRSDP
(this will need to be changed later).
Modified: mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp 2012-02-05 01:24:01 UTC (rev 11383)
+++ mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp 2012-02-05 01:24:29 UTC (rev 11384)
@@ -33,7 +33,7 @@
arma::vec lambda(function.NumConstraints());
lambda.ones();
lambda *= -1;
- lambda[0] = -0.70 * double(coordinates.n_cols);
+ lambda[0] = -double(coordinates.n_cols);
double penalty_threshold = DBL_MAX; // Ensure we update lambda immediately.
// Track the last objective to compare for convergence.
@@ -66,7 +66,7 @@
L_BFGS<AugLagrangianFunction<LagrangianFunction> >
lbfgs(f, numBasis, 1e-4, 0.9, 1e-10, 100, 1e-20, 1e20);
- if (!lbfgs.Optimize(0, coordinates))
+ if (!lbfgs.Optimize(1000, coordinates))
Log::Warn << "L-BFGS reported an error during optimization."
<< std::endl;
More information about the mlpack-svn
mailing list