[mlpack] 15/324: added comment to base case. Some more preliminaries for rectangle trees.
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Sun Aug 17 08:21:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to branch svn-trunk
in repository mlpack.
commit 62edcbed2a5ba5d1953a37a66b3d68c41c998dac
Author: andrewmw94 <andrewmw94 at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date: Thu May 22 15:16:15 2014 +0000
added comment to base case. Some more preliminaries for rectangle trees.
git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@16542 9d5b8971-822b-0410-80eb-d18c1038ef23
---
src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp | 2 +-
src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
index 5ed3348..fed4534 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
@@ -76,7 +76,7 @@ class RectangleTree
* @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.
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
index cd37e44..effa4ac 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
@@ -22,7 +22,14 @@ class NeighborSearchRules
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);
/**
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git
More information about the debian-science-commits
mailing list