[mlpack-svn] r14402 - mlpack/trunk/src/mlpack/core/tree

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Tue Feb 26 18:04:41 EST 2013


Author: rcurtin
Date: 2013-02-26 18:04:40 -0500 (Tue, 26 Feb 2013)
New Revision: 14402

Modified:
   mlpack/trunk/src/mlpack/core/tree/mrkd_statistic.cpp
   mlpack/trunk/src/mlpack/core/tree/mrkd_statistic_impl.hpp
Log:
Oops, I did not realize there was an _impl file...


Modified: mlpack/trunk/src/mlpack/core/tree/mrkd_statistic.cpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/mrkd_statistic.cpp	2013-02-26 23:03:17 UTC (rev 14401)
+++ mlpack/trunk/src/mlpack/core/tree/mrkd_statistic.cpp	2013-02-26 23:04:40 UTC (rev 14402)
@@ -18,16 +18,6 @@
     parentStat(NULL)
 { }
 
-template<typename TreeType>
-MRKDStatistic::MRKDStatistic(const TreeType& /* node */) :
-    dataset(NULL),
-    begin(0),
-    count(0),
-    leftStat(NULL),
-    rightStat(NULL),
-    parentStat(NULL)
-{ }
-
 /**
  * Returns a string representation of this object.
  */

Modified: mlpack/trunk/src/mlpack/core/tree/mrkd_statistic_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/mrkd_statistic_impl.hpp	2013-02-26 23:03:17 UTC (rev 14401)
+++ mlpack/trunk/src/mlpack/core/tree/mrkd_statistic_impl.hpp	2013-02-26 23:04:40 UTC (rev 14402)
@@ -13,13 +13,23 @@
 namespace mlpack {
 namespace tree {
 
+template<typename TreeType>
+MRKDStatistic::MRKDStatistic(const TreeType& /* node */) :
+    dataset(NULL),
+    begin(0),
+    count(0),
+    leftStat(NULL),
+    rightStat(NULL),
+    parentStat(NULL)
+{ }
+
 /**
  * This constructor is called when a leaf is created.
  *
  * @param dataset Matrix that the tree is being built on.
  * @param begin Starting index corresponding to this leaf.
  * @param count Number of points held in this leaf.
- */
+ *
 template<typename MatType>
 MRKDStatistic::MRKDStatistic(const TreeType& node) :
     dataset(&dataset),
@@ -47,7 +57,7 @@
  * @param count Number of points held in this leaf.
  * @param leftStat MRKDStatistic object of the left child node.
  * @param rightStat MRKDStatistic object of the right child node.
- */
+ *
 template<typename MatType>
 MRKDStatistic::MRKDStatistic(const MatType& dataset,
                              const size_t begin,
@@ -67,7 +77,7 @@
   centerOfMass = ((leftStat.centerOfMass * leftStat.count) +
                   (rightStat.centerOfMass * rightStat.count)) /
                   (leftStat.count + rightStat.count);
-  */
+  *
   centerOfMass = leftStat.centerOfMass + rightStat.centerOfMass;
 
   isWhitelistValid = false;
@@ -75,6 +85,7 @@
   leftStat.parentStat = this;
   rightStat.parentStat = this;
 }
+*/
 
 }; // namespace tree
 }; // namespace mlpack




More information about the mlpack-svn mailing list