[mlpack-git] master: Improve log message. (49822ef)
gitdub at mlpack.org
gitdub at mlpack.org
Wed Jun 22 14:09:07 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/a9f5622c8a14409111f2d71bf5c0f8aaa8ad4ae1...37fda23945b4f998cd5fa6ec011ae345236c8552
>---------------------------------------------------------------
commit 49822ef4179f31123e1e7e27be40d76f8e0804e0
Author: MarcosPividori <marcos.pividori at gmail.com>
Date: Wed Jun 22 12:44:37 2016 -0300
Improve log message.
>---------------------------------------------------------------
49822ef4179f31123e1e7e27be40d76f8e0804e0
src/mlpack/methods/neighbor_search/ns_model_impl.hpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
index 0a70562..075306b 100644
--- a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
@@ -414,16 +414,16 @@ void NSModel<SortPolicy>::Search(arma::mat&& querySet,
if (randomBasis)
querySet = q * querySet;
- Log::Info << "Searching for " << k;
- if (Epsilon() != 0)
- Log::Info << " approximate (e=" << Epsilon() << ")";
- Log::Info << " neighbors with ";
+ Log::Info << "Searching for " << k << " neighbors with ";
if (!Naive() && !SingleMode())
Log::Info << "dual-tree " << TreeName() << " search..." << std::endl;
else if (!Naive())
Log::Info << "single-tree " << TreeName() << " search..." << std::endl;
else
Log::Info << "brute-force (naive) search..." << std::endl;
+ if (Epsilon() != 0 && !Naive())
+ Log::Info << "Maximum of " << Epsilon() * 100 << "% relative error."
+ << std::endl;
BiSearchVisitor<SortPolicy> search(querySet, k, neighbors, distances,
leafSize);
@@ -436,16 +436,16 @@ void NSModel<SortPolicy>::Search(const size_t k,
arma::Mat<size_t>& neighbors,
arma::mat& distances)
{
- Log::Info << "Searching for " << k;
- if (Epsilon() != 0)
- Log::Info << " approximate (e=" << Epsilon() << ")";
- Log::Info << " neighbors with ";
+ Log::Info << "Searching for " << k << " neighbors with ";
if (!Naive() && !SingleMode())
Log::Info << "dual-tree " << TreeName() << " search..." << std::endl;
else if (!Naive())
Log::Info << "single-tree " << TreeName() << " search..." << std::endl;
else
Log::Info << "brute-force (naive) search..." << std::endl;
+ if (Epsilon() != 0 && !Naive())
+ Log::Info << "Maximum of " << Epsilon() * 100 << "% relative error."
+ << std::endl;
MonoSearchVisitor search(k, neighbors, distances);
boost::apply_visitor(search, nSearch);
More information about the mlpack-git
mailing list