[mlpack-git] master: Properly resetting auxBound. Start using a Reset() method, to avoid futures errors like this. (04a6439)
gitdub at mlpack.org
gitdub at mlpack.org
Sun Jun 5 16:13:44 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/c0d0563bc665ba40c0575a053d05d86f9259f06a...44883afb19a2f2dd0e1fe29d96c873bf97335521
>---------------------------------------------------------------
commit 04a643935896e7f561c7794af802dba740ad722f
Author: MarcosPividori <marcos.pividori at gmail.com>
Date: Fri Jun 3 09:43:33 2016 -0300
Properly resetting auxBound. Start using a Reset() method, to avoid futures errors like this.
>---------------------------------------------------------------
04a643935896e7f561c7794af802dba740ad722f
src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp | 4 +---
src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp | 11 +++++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
index e092766..d86f514 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
@@ -638,9 +638,7 @@ Search(const size_t k,
nodes.pop();
// Reset bounds of this node.
- node->Stat().FirstBound() = SortPolicy::WorstDistance();
- node->Stat().SecondBound() = SortPolicy::WorstDistance();
- node->Stat().LastDistance() = 0.0;
+ node->Stat().Reset();
// Then add the children.
for (size_t i = 0; i < node->NumChildren(); ++i)
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp
index dfcc5ad..433ea64 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp
@@ -57,6 +57,17 @@ class NeighborSearchStat
auxBound(SortPolicy::WorstDistance()),
lastDistance(0.0) { }
+ /**
+ * Reset statistic parameters to initial values.
+ */
+ void Reset()
+ {
+ firstBound = SortPolicy::WorstDistance();
+ secondBound = SortPolicy::WorstDistance();
+ auxBound = SortPolicy::WorstDistance();
+ lastDistance = 0.0;
+ }
+
//! Get the first bound.
double FirstBound() const { return firstBound; }
//! Modify the first bound.
More information about the mlpack-git
mailing list