[mlpack-svn] r16256 - mlpack/trunk/src/mlpack/core/metrics

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

Author: rcurtin
Date: Mon Feb 10 09:10:55 2014
New Revision: 16256

Log:
Minor fixes to ToString().


Modified:
   mlpack/trunk/src/mlpack/core/metrics/lmetric_impl.hpp
   mlpack/trunk/src/mlpack/core/metrics/mahalanobis_distance_impl.hpp

Modified: mlpack/trunk/src/mlpack/core/metrics/lmetric_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/metrics/lmetric_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/metrics/lmetric_impl.hpp	Mon Feb 10 09:10:55 2014
@@ -29,12 +29,14 @@
   return pow(sum, (1.0 / Power));
 }
 
-// String Conversion
-template<int Power, bool TakeRoot> 
-std::string LMetric<Power,TakeRoot>::ToString() const
+// String conversion.
+template<int Power, bool TakeRoot>
+std::string LMetric<Power, TakeRoot>::ToString() const
 {
   std::ostringstream convert;
-  convert << "LMetric [" << this << "]" << std::endl;;
+  convert << "LMetric [" << this << "]" << std::endl;
+  convert << "  Power: " << Power << std::endl;
+  convert << "  TakeRoot: " << (TakeRoot ? "true" : "false") << std::endl;
   return convert.str();
 }
 

Modified: mlpack/trunk/src/mlpack/core/metrics/mahalanobis_distance_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/metrics/mahalanobis_distance_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/metrics/mahalanobis_distance_impl.hpp	Mon Feb 10 09:10:55 2014
@@ -12,15 +12,6 @@
 namespace mlpack {
 namespace metric {
 
-
-// Convert Object into String
-template<bool TakeRoot>
-std::string MahalanobisDistance<TakeRoot>::ToString() const{
-  std::ostringstream convert;
-  convert << "MahalanobisDistance [" << this << "]" << std::endl;
-  return convert.str();
-}
-
 /**
  * Specialization for non-rooted case.
  */
@@ -51,6 +42,15 @@
   return sqrt(out[0]);
 }
 
+// Convert object into string.
+template<bool TakeRoot>
+std::string MahalanobisDistance<TakeRoot>::ToString() const
+{
+  std::ostringstream convert;
+  convert << "MahalanobisDistance [" << this << "]" << std::endl;
+  return convert.str();
+}
+
 }; // namespace metric
 }; // namespace mlpack