[mlpack-svn] r16260 - mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian

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

Author: rcurtin
Date: Mon Feb 10 09:21:48 2014
New Revision: 16260

Log:
Minor fixes to AugLagrangian ToString() methods.


Modified:
   mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
   mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp
   mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp

Modified: mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp	Mon Feb 10 09:21:48 2014
@@ -95,12 +95,14 @@
   return function.GetInitialPoint();
 }
 
-//Convert the Object to a String
+// Convert the object to a string.
 template<typename LagrangianFunction>
-std::string AugLagrangianFunction<LagrangianFunction>::ToString() const{
+std::string AugLagrangianFunction<LagrangianFunction>::ToString() const
+{
   std::ostringstream convert;
   convert << "AugLagrangianFunction [" << this << "]" << std::endl;
-  convert << "  Lagrange multipliers: " << lambda << std::endl;
+  convert << "  Lagrange multipliers:" << std::endl;
+  convert << lambda;
   convert << "  Penalty parameter: " << sigma << std::endl;
   return convert.str();
 }

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	(original)
+++ mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp	Mon Feb 10 09:21:48 2014
@@ -49,15 +49,16 @@
   return Optimize(coordinates, maxIterations);
 }
 
-//Convert the Object to a String
+// Convert the object to a string.
 template<typename LagrangianFunction>
-std::string AugLagrangian<LagrangianFunction>::ToString() const{
+std::string AugLagrangian<LagrangianFunction>::ToString() const
+{
   std::ostringstream convert;
   convert << "AugLagrangian [" << this << "]" << std::endl;
-  convert << "  Function to be Optimized: " <<std::endl;
-  convert << mlpack::util::Indent(function.ToString(),2);
-  convert << "    L-BFGS Selected: " <<std::endl; 
-  convert << mlpack::util::Indent(lbfgs.ToString(),2);
+  convert << "  Function:" << std::endl;
+  convert << mlpack::util::Indent(function.ToString(), 2);
+  convert << "  L-BFGS optimizer:" << std::endl;
+  convert << mlpack::util::Indent(lbfgs.ToString(), 2);
   return convert.str();
 }
 

Modified: mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp	(original)
+++ mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp	Mon Feb 10 09:21:48 2014
@@ -386,8 +386,10 @@
   return initialPoint;
 }
 
-std::string AugLagrangianTestFunction::ToString() const{
+std::string AugLagrangianTestFunction::ToString() const
+{
+  // The actual output is unimportant -- this object is only for testing anyway.
   std::ostringstream convert;
-  convert << "AugLagrangian Test [" << this << "]" << std::endl;
+  convert << "AugLagrangianTestFunction [" << this << "]" << std::endl;
   return convert.str();
 }