[mlpack-git] master, mlpack-1.0.x: Minor fixes to AugLagrangian ToString() methods. (e5d9577)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branches: master,mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit e5d9577f1f5fd3c5409de7a448451880833905cd
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Feb 10 14:21:48 2014 +0000

    Minor fixes to AugLagrangian ToString() methods.


>---------------------------------------------------------------

e5d9577f1f5fd3c5409de7a448451880833905cd
 .../aug_lagrangian/aug_lagrangian_function_impl.hpp         |  8 +++++---
 .../core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp  | 13 +++++++------
 .../aug_lagrangian/aug_lagrangian_test_functions.cpp        |  6 ++++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
index f568b30..93af545 100644
--- a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
+++ b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
@@ -95,12 +95,14 @@ const arma::mat& AugLagrangianFunction<LagrangianFunction>::GetInitialPoint()
   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();
 }
diff --git a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp
index e994662..967638f 100644
--- a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp
+++ b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_impl.hpp
@@ -49,15 +49,16 @@ bool AugLagrangian<LagrangianFunction>::Optimize(arma::mat& coordinates,
   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();
 }
 
diff --git a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp
index d525bf5..6503ae1 100644
--- a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp
+++ b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp
@@ -386,8 +386,10 @@ const arma::mat& LovaszThetaSDP::GetInitialPoint()
   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();
 }