[mlpack-git] master, mlpack-1.0.x: What was I thinking? This is a _far_ better solution than r16359. (1c88d1e)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:45:11 EST 2015
Repository : https://github.com/mlpack/mlpack
On branches: master,mlpack-1.0.x
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 1c88d1e8969ffb2b90d52bddf6b50528a91130fc
Author: Ryan Curtin <ryan at ratml.org>
Date: Mon Mar 10 12:20:38 2014 +0000
What was I thinking? This is a _far_ better solution than r16359.
>---------------------------------------------------------------
1c88d1e8969ffb2b90d52bddf6b50528a91130fc
src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
index e276843..c96b10a 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
@@ -195,7 +195,7 @@ inline double NeighborSearchRules<SortPolicy, MetricType, TreeType>::Score(
// on the query descendant distance and the distance between the query node
// and last traversal query node, but this case doesn't actually happen for
// kd-trees or cover trees.
- adjustedScore = SortPolicy::CombineBest(adjustedScore, adjustedScore);
+ adjustedScore = SortPolicy::BestDistance();
}
if (traversalInfo.LastReferenceNode() == referenceNode.Parent())
@@ -217,7 +217,7 @@ inline double NeighborSearchRules<SortPolicy, MetricType, TreeType>::Score(
// on the reference descendant distance and the distance between the
// reference node and last traversal reference node, but this case doesn't
// actually happen for kd-trees or cover trees.
- adjustedScore = SortPolicy::CombineBest(adjustedScore, adjustedScore);
+ adjustedScore = SortPolicy::BestDistance();
}
// Can we prune?
More information about the mlpack-git
mailing list