From 12cf0e7fcccfb4e0d2d4a6f26453f8cc61a60e69 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Mon, 24 Apr 2017 17:47:56 -0400 Subject: [PATCH] It says to remove it, so why not? --- src/mlpack/methods/rann/ra_search_rules.hpp | 16 ++++++---------- src/mlpack/methods/rann/ra_search_rules_impl.hpp | 4 ---- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/mlpack/methods/rann/ra_search_rules.hpp b/src/mlpack/methods/rann/ra_search_rules.hpp index 4772ec46f2..56b6c942f2 100644 --- a/src/mlpack/methods/rann/ra_search_rules.hpp +++ b/src/mlpack/methods/rann/ra_search_rules.hpp @@ -225,7 +225,6 @@ class RASearchRules const double oldScore); - size_t NumDistComputations() { return numDistComputations; } size_t NumEffectiveSamples() { if (numSamplesMade.n_elem == 0) @@ -270,27 +269,24 @@ class RASearchRules //! The instantiated metric. MetricType& metric; - //! Whether to sample at leaves or just use all of it + //! Whether to sample at leaves or just use all of it. bool sampleAtLeaves; - //! Whether to do exact computation on the first leaf before any sampling + //! Whether to do exact computation on the first leaf before any sampling. bool firstLeafExact; - //! The limit on the largest node that can be approximated by sampling + //! The limit on the largest node that can be approximated by sampling. size_t singleSampleLimit; - //! The minimum number of samples required per query + //! The minimum number of samples required per query. size_t numSamplesReqd; - //! The number of samples made for every query + //! The number of samples made for every query. arma::Col numSamplesMade; - //! The sampling ratio + //! The sampling ratio. double samplingRatio; - // TO REMOVE: just for testing - size_t numDistComputations; - //! If the query and reference set are identical, this is true. bool sameSet; diff --git a/src/mlpack/methods/rann/ra_search_rules_impl.hpp b/src/mlpack/methods/rann/ra_search_rules_impl.hpp index 3bec753040..9c2f095d8e 100644 --- a/src/mlpack/methods/rann/ra_search_rules_impl.hpp +++ b/src/mlpack/methods/rann/ra_search_rules_impl.hpp @@ -64,7 +64,6 @@ RASearchRules(const arma::mat& referenceSet, // Initialize some statistics to be collected during the search. numSamplesMade = arma::zeros >(querySet.n_cols); - numDistComputations = 0; samplingRatio = (double) numSamplesReqd / (double) n; Log::Info << "Minimum samples required per query: " << numSamplesReqd << @@ -135,9 +134,6 @@ double RASearchRules::BaseCase( numSamplesMade[queryIndex]++; - // TO REMOVE - numDistComputations++; - return distance; }