[mlpack-svn] r13185 - mlpack/trunk/src/mlpack/methods/local_coordinate_coding
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Jul 9 15:19:58 EDT 2012
Author: rcurtin
Date: 2012-07-09 15:19:58 -0400 (Mon, 09 Jul 2012)
New Revision: 13185
Modified:
mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_impl.hpp
mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_main.cpp
Log:
Use timers internally, not externally.
Modified: mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_impl.hpp 2012-07-09 18:41:47 UTC (rev 13184)
+++ mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_impl.hpp 2012-07-09 19:19:58 UTC (rev 13185)
@@ -33,6 +33,8 @@
void LocalCoordinateCoding<DictionaryInitializer>::Encode(
const size_t maxIterations)
{
+ Timer::Start("local_coordinate_coding");
+
double lastObjVal = DBL_MAX;
// Take the initial coding step, which has to happen before entering the main
@@ -89,6 +91,8 @@
lastObjVal = curObjVal;
}
+
+ Timer::Stop("local_coordinate_coding");
}
template<typename DictionaryInitializer>
Modified: mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_main.cpp 2012-07-09 18:41:47 UTC (rev 13184)
+++ mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc_main.cpp 2012-07-09 19:19:58 UTC (rev 13185)
@@ -127,9 +127,7 @@
}
// Run LCC.
- Timer::Start("local_coordinate_coding");
lcc.Encode(maxIterations);
- Timer::Stop("local_coordinate_coding");
// Save the results.
Log::Info << "Saving dictionary matrix to '" << dictionaryFile << "'.\n";
@@ -143,9 +141,7 @@
LocalCoordinateCoding<> lcc(input, atoms, lambda);
// Run LCC.
- Timer::Start("local_coordinate_coding");
lcc.Encode(maxIterations);
- Timer::Stop("local_coordinate_coding");
// Save the results.
Log::Info << "Saving dictionary matrix to '" << dictionaryFile << "'.\n";
More information about the mlpack-svn
mailing list