[mlpack-svn] r14249 - in mlpack/tags/mlpack-1.0.4: . src/mlpack/core/tree

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

Author: rcurtin
Date: 2013-02-08 16:05:53 -0500 (Fri, 08 Feb 2013)
New Revision: 14249

Added:
   mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/mrkd_statistic.cpp
Modified:
   mlpack/tags/mlpack-1.0.4/
   mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/CMakeLists.txt
Log:
Make minor updates that weren't done in mlpack-1.x branch.



Property changes on: mlpack/tags/mlpack-1.0.4
___________________________________________________________________
Added: svn:mergeinfo
   + /mlpack/branches/mlpack-1.x:14248

Modified: mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/CMakeLists.txt
===================================================================
--- mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/CMakeLists.txt	2013-02-08 21:03:39 UTC (rev 14248)
+++ mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/CMakeLists.txt	2013-02-08 21:05:53 UTC (rev 14249)
@@ -24,6 +24,7 @@
   statistic.hpp
   mrkd_statistic.hpp
   mrkd_statistic_impl.hpp
+  mrkd_statistic.cpp
 )
 
 # add directory name to sources

Copied: mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/mrkd_statistic.cpp (from rev 14248, mlpack/branches/mlpack-1.x/src/mlpack/core/tree/mrkd_statistic.cpp)
===================================================================
--- mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/mrkd_statistic.cpp	                        (rev 0)
+++ mlpack/tags/mlpack-1.0.4/src/mlpack/core/tree/mrkd_statistic.cpp	2013-02-08 21:05:53 UTC (rev 14249)
@@ -0,0 +1,43 @@
+/**
+ * @file mrkd_statistic.cpp
+ * @author James Cline
+ *
+ * Definition of the statistic for multi-resolution kd-trees.
+ */
+#include "mrkd_statistic.hpp"
+
+using namespace mlpack;
+using namespace mlpack::tree;
+
+MRKDStatistic::MRKDStatistic() :
+    dataset(NULL),
+    begin(0),
+    count(0),
+    leftStat(NULL),
+    rightStat(NULL),
+    parentStat(NULL)
+{ }
+
+/**
+ * Returns a string representation of this object.
+ */
+std::string MRKDStatistic::ToString() const
+{
+  std::ostringstream convert;
+
+  convert << "MRKDStatistic [" << this << std::endl;
+  convert << "begin: " << begin << std::endl;
+  convert << "count: " << count << std::endl;
+  convert << "sumOfSquaredNorms: " << sumOfSquaredNorms << std::endl;
+  if (leftStat != NULL)
+  {
+    convert << "leftStat:" << std::endl;
+    convert << mlpack::util::Indent(leftStat->ToString());
+  }
+  if (rightStat != NULL)
+  {
+    convert << "rightStat:" << std::endl;
+    convert << mlpack::util::Indent(rightStat->ToString());
+  }
+  return convert.str();
+}