Remove unused information from neighbor search stats.

MarcosPividori · May 31, 2016 · ba4c5bb · ba4c5bb
1 parent 6877607
commit ba4c5bb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
@@ -640,7 +640,6 @@ Search(const size_t k,
         // Reset bounds of this node.
         node->Stat().FirstBound() = SortPolicy::WorstDistance();
         node->Stat().SecondBound() = SortPolicy::WorstDistance();
-        node->Stat().Bound() = SortPolicy::WorstDistance();
         node->Stat().LastDistance() = 0.0;
 
         // Then add the children.

diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp
@@ -32,11 +32,6 @@ class NeighborSearchStat
   //! The aux bound on the node's neighbor distances (B_aux). This represents
   //! the best descendant candidate distance (used to calculate secondBound).
   double auxBound;
-  //! The better of the two bounds.
-  double bound;
-
-  //! The last distance evaluation node.
-  void* lastDistanceNode;
   //! The last distance evaluation.
   double lastDistance;
 
@@ -49,7 +44,6 @@ class NeighborSearchStat
       firstBound(SortPolicy::WorstDistance()),
       secondBound(SortPolicy::WorstDistance()),
       auxBound(SortPolicy::WorstDistance()),
-      bound(SortPolicy::WorstDistance()),
       lastDistance(0.0) { }
 
   /**
@@ -61,7 +55,6 @@ class NeighborSearchStat
       firstBound(SortPolicy::WorstDistance()),
       secondBound(SortPolicy::WorstDistance()),
       auxBound(SortPolicy::WorstDistance()),
-      bound(SortPolicy::WorstDistance()),
       lastDistance(0.0) { }
 
   //! Get the first bound.
@@ -76,10 +69,6 @@ class NeighborSearchStat
   double AuxBound() const { return auxBound; }
   //! Modify the aux bound.
   double& AuxBound() { return auxBound; }
-  //! Get the overall bound (the better of the two bounds).
-  double Bound() const { return bound; }
-  //! Modify the overall bound (it should be the better of the two bounds).
-  double& Bound() { return bound; }
   //! Get the last distance calculation.
   double LastDistance() const { return lastDistance; }
   //! Modify the last distance calculation.
@@ -94,7 +83,6 @@ class NeighborSearchStat
     ar & CreateNVP(firstBound, "firstBound");
     ar & CreateNVP(secondBound, "secondBound");
     ar & CreateNVP(auxBound, "auxBound");
-    ar & CreateNVP(bound, "bound");
     ar & CreateNVP(lastDistance, "lastDistance");
   }
 };