[mlpack-svn] r15789 - mlpack/trunk/src/mlpack/methods/neighbor_search

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Mon Sep 16 21:38:03 2013
New Revision: 15789

Log:
Two things: actually do some pruning, and, get parent base case evaluations
correctly.  I cannot believe how long it took me to track that down.  Ugh...


Modified:
   mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp	Mon Sep 16 21:38:03 2013
@@ -149,7 +149,7 @@
       if ((lastQuery != NULL) &&
           (queryNode.Point(0) == lastQuery->Point(0)))
       {
-        baseCase = queryNode.Stat().LastDistance();
+        baseCase = referenceNode.Stat().LastDistance();
         alreadyDone = true;
       }
 
@@ -196,10 +196,9 @@
       lastBaseCase = baseCase;
     }
 
-//    distance = SortPolicy::CombineBest(baseCase,
-//        queryNode.FurthestDescendantDistance() +
-//        referenceNode.FurthestDescendantDistance());
-    distance = 0;
+    distance = SortPolicy::CombineBest(baseCase,
+        queryNode.FurthestDescendantDistance() +
+        referenceNode.FurthestDescendantDistance());
 
     // Update the last distance calculation for the query and reference nodes.
     queryNode.Stat().LastDistanceNode() = (void*) &referenceNode;