[mlpack-svn] r14083 - mlpack/trunk/src/mlpack/core/tree/cover_tree

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

Author: rcurtin
Date: 2013-01-05 18:27:18 -0500 (Sat, 05 Jan 2013)
New Revision: 14083

Modified:
   mlpack/trunk/src/mlpack/core/tree/cover_tree/dual_tree_traverser_impl.hpp
Log:
Don't use Prescore(); it doesn't work.  Comment out for now (it may be removed
later).


Modified: mlpack/trunk/src/mlpack/core/tree/cover_tree/dual_tree_traverser_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/cover_tree/dual_tree_traverser_impl.hpp	2013-01-05 23:27:05 UTC (rev 14082)
+++ mlpack/trunk/src/mlpack/core/tree/cover_tree/dual_tree_traverser_impl.hpp	2013-01-05 23:27:18 UTC (rev 14083)
@@ -212,21 +212,21 @@
 
       // Try to prune based on shell().  This is hackish and will need to be
       // refined or cleaned at some point.
-      double score = rule.PrescoreQ(queryNode, candidateQueryNode, *refNode,
-          frame.baseCase);
+//      double score = rule.PrescoreQ(queryNode, candidateQueryNode, *refNode,
+//          frame.baseCase);
 
-      if (score == DBL_MAX)
-      {
-        ++numPrunes;
-        continue;
-      }
+//      if (score == DBL_MAX)
+//      {
+//        ++numPrunes;
+//        continue;
+//      }
 
 //      Log::Debug << "Recheck reference node " << refNode->Point() <<
 //          " scale " << refNode->Scale() << " which has old score " <<
 //          oldScore << " with old reference index " << frame.referenceIndex
 //          << " and old query index " << frame.queryIndex << std::endl;
 
-      score = rule.Rescore(candidateQueryNode, *refNode, oldScore);
+      double score = rule.Rescore(candidateQueryNode, *refNode, oldScore);
 
 //      Log::Debug << "Rescored as " << score << std::endl;
 
@@ -479,21 +479,21 @@
 //            " scale " << refNode->Scale() << ", reference child " <<
 //            refNode->Child(j).Point() << " scale " << refNode->Child(j).Scale()
 //            << " with base case " << baseCase;
-        childScore = rule.Prescore(queryNode, *refNode, refNode->Child(j),
-            frame.baseCase);
+//        childScore = rule.Prescore(queryNode, *refNode, refNode->Child(j),
+//            frame.baseCase);
 //        Log::Debug << " and result " << childScore << ".\n";
 
-        if (childScore == DBL_MAX)
-        {
-          ++numPrunes;
-          continue;
-        }
+//        if (childScore == DBL_MAX)
+//        {
+//          ++numPrunes;
+//          continue;
+//        }
 
         // Calculate the base case of each child.
         baseCase = rule.BaseCase(queryIndex, refIndex);
 
         // See if we can prune it.
-        childScore = rule.Score(queryNode, refNode->Child(j), baseCase);
+        double childScore = rule.Score(queryNode, refNode->Child(j), baseCase);
 
         if (childScore == DBL_MAX)
         {