[mlpack-svn] r16190 - mlpack/trunk/src/mlpack/core/dists

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

Author: rcurtin
Date: Tue Jan 28 17:35:48 2014
New Revision: 16190

Log:
  convert << util::Indent(probabilities);
Minor modifications to ToString()s in distributions.


Modified:
   mlpack/trunk/src/mlpack/core/dists/discrete_distribution.cpp
   mlpack/trunk/src/mlpack/core/dists/gaussian_distribution.cpp

Modified: mlpack/trunk/src/mlpack/core/dists/discrete_distribution.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/dists/discrete_distribution.cpp	(original)
+++ mlpack/trunk/src/mlpack/core/dists/discrete_distribution.cpp	Tue Jan 28 17:35:48 2014
@@ -111,7 +111,13 @@
 {
   std::ostringstream convert;
   convert << "DiscreteDistribution [" << this << "]" << std::endl;
-  convert << "Probabilities" << std::endl << probabilities;
+
+  // Secondary object so we can indent the probabilities.
+  std::ostringstream prob;
+  prob << "Probabilities:" << std::endl;
+  prob << probabilities;
+
+  convert << util::Indent(prob.str());
   return convert.str();
 }
 

Modified: mlpack/trunk/src/mlpack/core/dists/gaussian_distribution.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/dists/gaussian_distribution.cpp	(original)
+++ mlpack/trunk/src/mlpack/core/dists/gaussian_distribution.cpp	Tue Jan 28 17:35:48 2014
@@ -139,8 +139,13 @@
 std::string GaussianDistribution::ToString() const
 {
   std::ostringstream convert;
-  convert << "GaussianDistribution: " << this << std::endl;
-  convert << "mean: " << std::endl << mean << std::endl;
-  convert << "covariance: " << std::endl << covariance << std::endl;
+  convert << "GaussianDistribution [" << this << "]" << std::endl;
+
+  // Secondary ostringstream so things can be indented right.
+  std::ostringstream data;
+  data << "Mean: " << std::endl << mean << std::endl;
+  data << "Covariance: " << std::endl << covariance << std::endl;
+
+  convert << util::Indent(data.str());
   return convert.str();
 }