[mlpack-svn] r13186 - mlpack/trunk/src/mlpack/methods/sparse_coding

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

Author: rcurtin
Date: 2012-07-09 15:20:53 -0400 (Mon, 09 Jul 2012)
New Revision: 13186

Modified:
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
Log:
Use timers internally, not externally.


Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp	2012-07-09 19:19:58 UTC (rev 13185)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp	2012-07-09 19:20:53 UTC (rev 13186)
@@ -34,6 +34,8 @@
                                                  const double objTolerance,
                                                  const double newtonTolerance)
 {
+  Timer::Start("sparse_coding");
+
   double lastObjVal = DBL_MAX;
 
   // Take the initial coding step, which has to happen before entering the main
@@ -81,6 +83,8 @@
 
     lastObjVal = curObjVal;
   }
+
+  Timer::Stop("sparse_coding");
 }
 
 template<typename DictionaryInitializer>

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp	2012-07-09 19:19:58 UTC (rev 13185)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp	2012-07-09 19:20:53 UTC (rev 13186)
@@ -127,9 +127,7 @@
     }
 
     // Run sparse coding.
-    Timer::Start("sparse_coding");
     sc.Encode(maxIterations);
-    Timer::Stop("sparse_coding");
 
     // Save the results.
     Log::Info << "Saving dictionary matrix to '" << dictionaryFile << "'.\n";
@@ -143,9 +141,7 @@
     SparseCoding<> sc(matX, atoms, lambda1, lambda2);
 
     // Run sparse coding.
-    Timer::Start("sparse_coding");
     sc.Encode(maxIterations);
-    Timer::Stop("sparse_coding");
 
     // Save the results.
     Log::Info << "Saving dictionary matrix to '" << dictionaryFile << "'.\n";