[mlpack-git] master: Avoid calculating bounds when oldScore is the best possible. (9c1ef2a)

gitdub at mlpack.org gitdub at mlpack.org
Thu Aug 18 13:39:26 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/0f4b25acd6aaa14294c044874ba6cc0751712baa...0a19d07bd39e6223991976474bc79671ba8aa0f0

>---------------------------------------------------------------

commit 9c1ef2a7bd9fecdf8c5310398d9ec9185de6fbc6
Author: MarcosPividori <marcos.pividori at gmail.com>
Date:   Wed Jul 27 17:43:26 2016 -0300

    Avoid calculating bounds when oldScore is the best possible.


>---------------------------------------------------------------

9c1ef2a7bd9fecdf8c5310398d9ec9185de6fbc6
 src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp      | 3 +++
 .../methods/neighbor_search/neighbor_search_rules_spill_impl.hpp       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 e40d09e..d581e91 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
@@ -330,6 +330,9 @@ inline double NeighborSearchRules<SortPolicy, MetricType, TreeType>::Rescore(
   if (oldScore == DBL_MAX)
     return oldScore;
 
+  if (oldScore == SortPolicy::BestDistance())
+    return oldScore;
+
   // Update our bound.
   const double bestDistance = CalculateBound(queryNode);
 
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp
index 2ea54ba..416c601 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp
@@ -324,7 +324,7 @@ inline double NeighborSearchRules<SortPolicy, MetricType, tree::SpillTree<
   if (oldScore == DBL_MAX)
     return oldScore;
 
-  if (oldScore == 0)
+  if (oldScore == SortPolicy::BestDistance())
     return oldScore;
 
   // Update our bound.




More information about the mlpack-git mailing list