[mlpack-svn] r16271 - in mlpack/trunk/src/mlpack: core/kernels core/optimizers/lrsdp tests

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

Author: birm
Date: Mon Feb 10 12:12:51 2014
New Revision: 16271

Log:
Updated Test and pspectrum_string_kernel


Added:
   mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp_impl.hpp
      - copied, changed from r16236, /mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp_impl.hpp
Modified:
   mlpack/trunk/src/mlpack/core/kernels/pspectrum_string_kernel.hpp
   mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp.cpp
   mlpack/trunk/src/mlpack/tests/to_string_test.cpp

Modified: mlpack/trunk/src/mlpack/core/kernels/pspectrum_string_kernel.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/kernels/pspectrum_string_kernel.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/kernels/pspectrum_string_kernel.hpp	Mon Feb 10 12:12:51 2014
@@ -101,6 +101,12 @@
   std::string ToString() const{
     std::ostringstream convert;
     convert << "PSpectrumStringKernel [" << this << "]" << std::endl;
+    convert << "  p used: " << p << std::endl;
+    convert << "  Dataset:" << datasets.size() << std::endl;
+    std::ostringstream convertb;
+    for (size_t ind=0; ind < datasets.size(); ind++)
+      convertb << datasets[ind].size();
+    convert << mlpack::util::Indent(convertb.str(),2);
     return convert.str();
   }
  private:

Modified: mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp.cpp	(original)
+++ mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp.cpp	Mon Feb 10 12:12:51 2014
@@ -84,10 +84,9 @@
 {
   std::ostringstream convert;
   convert << "LRSDP [" << this << "]" << std::endl;
-  convert << "Matrix Size: " << c.n_rows << "x" << c.n_cols << std::endl;
-  convert << "Initial point Size : " << initialPoint.n_rows << "x"
+  convert << "  Matrix Size: " << c.n_rows << "x" << c.n_cols << std::endl;
+  convert << "  Initial point Size : " << initialPoint.n_rows << "x"
       << initialPoint.n_cols << std::endl;
-  //convert << "AugLagrangian Info: " << std::endl << augLag;
   return convert.str();
 }
 

Copied: mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp_impl.hpp (from r16236, /mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp_impl.hpp)
==============================================================================
--- /mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/optimizers/lrsdp/lrsdp_impl.hpp	Mon Feb 10 12:12:51 2014
@@ -14,16 +14,6 @@
 namespace mlpack {
 namespace optimization {
 
-// convert the object to a string
-std::string LRSDP::ToString() const{
-  std::ostringstream convert;
-  convert << "LRSDP [" << this << "]" << std::endl;
-  convert << "Matrix Size: " << c.n_rows << "x" << c.n_cols << std::endl;
-  convert << "Initial point Size : " << initialPoint.n_rows << "x" 
-      << initialPoint.n_cols << std::endl;
-  //convert << "AugLagrangian Info: " << std::endl << augLag;
-  return convert.str();
-}
 
 // Custom specializations of the AugmentedLagrangianFunction for the LRSDP case.
 template<>

Modified: mlpack/trunk/src/mlpack/tests/to_string_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/to_string_test.cpp	(original)
+++ mlpack/trunk/src/mlpack/tests/to_string_test.cpp	Mon Feb 10 12:12:51 2014
@@ -21,7 +21,7 @@
 
 #include <mlpack/core/optimizers/aug_lagrangian/aug_lagrangian.hpp>
 #include <mlpack/core/optimizers/lbfgs/lbfgs.hpp>
-//#include <mlpack/core/optimizers/lrsdp/lrsdp.hpp>
+#include <mlpack/core/optimizers/lrsdp/lrsdp.hpp>
 #include <mlpack/core/optimizers/sgd/sgd.hpp>
 #include <mlpack/methods/nca/nca_softmax_error_function.hpp>
 #include <mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp>
@@ -229,6 +229,17 @@
   BOOST_REQUIRE_NE(s, "");
 }
 
+BOOST_AUTO_TEST_CASE(LRSDPString)
+{
+  arma::mat c(40, 40);
+  c.randn();
+  const size_t b=3;
+  mlpack::optimization::LRSDP d(b,c);
+  Log::Debug << d;
+  std::string s = d.ToString();
+  BOOST_REQUIRE_NE(s, "");
+}
+
 BOOST_AUTO_TEST_CASE(BallBoundString)
 {
   BallBound<> d(3.5, "1.0 2.0");