[mlpack-git] master: Print number of base cases and scores even when a tree is passed. (067ff77)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/76eb541d45efe31729b2a6780bb5191f6a440ae3...067ff7713b9cfea63941f15ac0148bf5d7f55d84

>---------------------------------------------------------------

commit 067ff7713b9cfea63941f15ac0148bf5d7f55d84
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Aug 11 14:00:20 2016 -0400

    Print number of base cases and scores even when a tree is passed.
    
    Also switch to std::endl for consistency (there is no other compelling reason
    for that switch).


>---------------------------------------------------------------

067ff7713b9cfea63941f15ac0148bf5d7f55d84
 .../neighbor_search/neighbor_search_impl.hpp       | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
index 79a31d0..d5112cb 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
@@ -400,8 +400,10 @@ Search(const MatType& querySet,
     scores += rules.Scores();
     baseCases += rules.BaseCases();
 
-    Log::Info << rules.Scores() << " node combinations were scored.\n";
-    Log::Info << rules.BaseCases() << " base cases were calculated.\n";
+    Log::Info << rules.Scores() << " node combinations were scored."
+        << std::endl;
+    Log::Info << rules.BaseCases() << " base cases were calculated."
+        << std::endl;
 
     rules.GetResults(*neighborPtr, *distancePtr);
   }
@@ -425,8 +427,10 @@ Search(const MatType& querySet,
     scores += rules.Scores();
     baseCases += rules.BaseCases();
 
-    Log::Info << rules.Scores() << " node combinations were scored.\n";
-    Log::Info << rules.BaseCases() << " base cases were calculated.\n";
+    Log::Info << rules.Scores() << " node combinations were scored."
+        << std::endl;
+    Log::Info << rules.BaseCases() << " base cases were calculated."
+        << std::endl;
 
     rules.GetResults(*neighborPtr, *distancePtr);
 
@@ -549,6 +553,9 @@ Search(Tree* queryTree,
   scores += rules.Scores();
   baseCases += rules.BaseCases();
 
+  Log::Info << rules.Scores() << " node combinations were scored." << std::endl;
+  Log::Info << rules.BaseCases() << " base cases were calculated." << std::endl;
+
   rules.GetResults(*neighborPtr, distances);
 
   Timer::Stop("computing_neighbors");
@@ -634,8 +641,10 @@ Search(const size_t k,
     scores += rules.Scores();
     baseCases += rules.BaseCases();
 
-    Log::Info << rules.Scores() << " node combinations were scored.\n";
-    Log::Info << rules.BaseCases() << " base cases were calculated.\n";
+    Log::Info << rules.Scores() << " node combinations were scored."
+        << std::endl;
+    Log::Info << rules.BaseCases() << " base cases were calculated."
+        << std::endl;
   }
   else
   {
@@ -667,8 +676,10 @@ Search(const size_t k,
     scores += rules.Scores();
     baseCases += rules.BaseCases();
 
-    Log::Info << rules.Scores() << " node combinations were scored.\n";
-    Log::Info << rules.BaseCases() << " base cases were calculated.\n";
+    Log::Info << rules.Scores() << " node combinations were scored."
+        << std::endl;
+    Log::Info << rules.BaseCases() << " base cases were calculated."
+        << std::endl;
 
     // Next time we perform this search, we'll need to reset the tree.
     treeNeedsReset = true;