[mlpack-svn] r16542 - in mlpack/trunk/src/mlpack: core/tree/rectangle_tree methods/neighbor_search
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu May 22 11:16:15 EDT 2014
Author: andrewmw94
Date: Thu May 22 11:16:15 2014
New Revision: 16542
Log:
added comment to base case. Some more preliminaries for rectangle trees.
Modified:
mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp (original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp Thu May 22 11:16:15 2014
@@ -76,7 +76,7 @@
* @param leafSize Size of each leaf in the tree;
* @param maxNumChildren The maximum number of child nodes a non-leaf node may have.
*/
- RectangleTree(MatType& data, const size_t leafSize = 20, const size_t maxNumChildren = 5);
+ RectangleTree(MatType& data, const size_t leafSize = 20, const size_t maxNumChildren = 4);
//TODO implement the oldFromNew stuff if applicable.
Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp (original)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp Thu May 22 11:16:15 2014
@@ -22,7 +22,14 @@
arma::Mat<size_t>& neighbors,
arma::mat& distances,
MetricType& metric);
-
+ /**
+ * Get the distance from the query point to the reference point.
+ * This will update the "neighbor" matrix with the new point if appropriate
+ * and will track the number of base cases (number of points evaluated).
+ *
+ * @param queryIndex Index of query point.
+ * @param referenceIndex Index of reference point.
+ */
double BaseCase(const size_t queryIndex, const size_t referenceIndex);
/**
More information about the mlpack-svn
mailing list