[mlpack-svn] r14974 - mlpack/trunk/src/mlpack/methods/fastmks

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2013-04-29 15:37:17 -0400 (Mon, 29 Apr 2013)
New Revision: 14974

Modified:
   mlpack/trunk/src/mlpack/methods/fastmks/fastmks_impl.hpp
Log:
Stop counting kernel evaluations and distance evaluations.  This may be brought
back but before, it was done in a very ugly way...


Modified: mlpack/trunk/src/mlpack/methods/fastmks/fastmks_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/fastmks/fastmks_impl.hpp	2013-04-29 19:13:21 UTC (rev 14973)
+++ mlpack/trunk/src/mlpack/methods/fastmks/fastmks_impl.hpp	2013-04-29 19:37:17 UTC (rev 14974)
@@ -180,8 +180,6 @@
 
   Timer::Start("computing_products");
 
-  size_t kernelEvaluations = 0;
-
   // Naive implementation.
   if (naive)
   {
@@ -195,7 +193,6 @@
 
         const double eval = metric.Kernel().Evaluate(querySet.unsafe_col(q),
             referenceSet.unsafe_col(r));
-        ++kernelEvaluations;
 
         size_t insertPosition;
         for (insertPosition = 0; insertPosition < indices.n_rows;
@@ -210,8 +207,6 @@
 
     Timer::Stop("computing_products");
 
-    Log::Info << "Kernel evaluations: " << kernelEvaluations << "."
-        << std::endl;
     return;
   }
 
@@ -232,10 +227,6 @@
     const size_t numPrunes = traverser.NumPrunes();
 
     Log::Info << "Pruned " << numPrunes << " nodes." << std::endl;
-    Log::Info << "Kernel evaluations: " << kernelEvaluations << "."
-        << std::endl;
-    Log::Info << "Distance evaluations: " << distanceEvaluations << "."
-        << std::endl;
 
     Timer::Stop("computing_products");
     return;
@@ -255,9 +246,6 @@
   const size_t numPrunes = traverser.NumPrunes();
 
   Log::Info << "Pruned " << numPrunes << " nodes." << std::endl;
-  Log::Info << "Kernel evaluations: " << kernelEvaluations << "." << std::endl;
-  Log::Info << "Distance evaluations: " << distanceEvaluations << "."
-      << std::endl;
 
   Timer::Stop("computing_products");
   return;