[mlpack-svn] r13801 - in mlpack/trunk/src/mlpack/methods: gmm hmm

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

Author: rcurtin
Date: 2012-10-31 15:18:53 -0400 (Wed, 31 Oct 2012)
New Revision: 13801

Modified:
   mlpack/trunk/src/mlpack/methods/gmm/gmm_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_util.hpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
Log:
Fixes to use mlpack::util not mlpack::utilities.


Modified: mlpack/trunk/src/mlpack/methods/gmm/gmm_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/gmm/gmm_main.cpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/gmm/gmm_main.cpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -21,7 +21,7 @@
 
 using namespace mlpack;
 using namespace mlpack::gmm;
-using namespace mlpack::utilities;
+using namespace mlpack::util;
 
 int main(int argc, char* argv[])
 {
@@ -53,7 +53,7 @@
   Timer::Stop("em");
 
   ////// OUTPUT RESULTS //////
-  mlpack::utilities::SaveRestoreUtility save;
+  SaveRestoreUtility save;
   save.SaveParameter(gmm.Gaussians(), "gaussians");
   save.SaveParameter(gmm.Dimensionality(), "dimensionality");
   save.SaveParameter(trans(gmm.Weights()), "weights");

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -31,7 +31,7 @@
 using namespace mlpack;
 using namespace mlpack::hmm;
 using namespace mlpack::distribution;
-using namespace mlpack::utilities;
+using namespace mlpack::util;
 using namespace mlpack::gmm;
 using namespace mlpack::math;
 using namespace arma;

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -22,7 +22,7 @@
 using namespace mlpack;
 using namespace mlpack::hmm;
 using namespace mlpack::distribution;
-using namespace mlpack::utilities;
+using namespace mlpack::util;
 using namespace mlpack::gmm;
 using namespace arma;
 using namespace std;

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -46,7 +46,7 @@
 using namespace mlpack;
 using namespace mlpack::hmm;
 using namespace mlpack::distribution;
-using namespace mlpack::utilities;
+using namespace mlpack::util;
 using namespace mlpack::gmm;
 using namespace mlpack::math;
 using namespace arma;

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_util.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_util.hpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_util.hpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -21,7 +21,7 @@
  * @param sr SaveRestoreUtility to use.
  */
 template<typename Distribution>
-void SaveHMM(const HMM<Distribution>& hmm, utilities::SaveRestoreUtility& sr);
+void SaveHMM(const HMM<Distribution>& hmm, util::SaveRestoreUtility& sr);
 
 /**
  * Load an HMM from file.  This only works for GMMs, DiscreteDistributions, and
@@ -31,7 +31,7 @@
  * @param sr SaveRestoreUtility to use.
  */
 template<typename Distribution>
-void LoadHMM(HMM<Distribution>& hmm, utilities::SaveRestoreUtility& sr);
+void LoadHMM(HMM<Distribution>& hmm, util::SaveRestoreUtility& sr);
 
 }; // namespace hmm
 }; // namespace mlpack

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -16,7 +16,7 @@
 namespace hmm {
 
 template<typename Distribution>
-void SaveHMM(const HMM<Distribution>& hmm, utilities::SaveRestoreUtility& sr)
+void SaveHMM(const HMM<Distribution>& hmm, util::SaveRestoreUtility& sr)
 {
   Log::Fatal << "HMM save not implemented for arbitrary distributions."
       << std::endl;
@@ -24,7 +24,7 @@
 
 template<>
 void SaveHMM(const HMM<distribution::DiscreteDistribution>& hmm,
-             utilities::SaveRestoreUtility& sr)
+             util::SaveRestoreUtility& sr)
 {
   std::string type = "discrete";
   size_t states = hmm.Transition().n_rows;
@@ -45,7 +45,7 @@
 
 template<>
 void SaveHMM(const HMM<distribution::GaussianDistribution>& hmm,
-             utilities::SaveRestoreUtility& sr)
+             util::SaveRestoreUtility& sr)
 {
   std::string type = "gaussian";
   size_t states = hmm.Transition().n_rows;
@@ -70,7 +70,7 @@
 
 template<>
 void SaveHMM(const HMM<gmm::GMM<> >& hmm,
-             utilities::SaveRestoreUtility& sr)
+             util::SaveRestoreUtility& sr)
 {
   std::string type = "gmm";
   size_t states = hmm.Transition().n_rows;
@@ -105,7 +105,7 @@
 }
 
 template<typename Distribution>
-void LoadHMM(HMM<Distribution>& hmm, utilities::SaveRestoreUtility& sr)
+void LoadHMM(HMM<Distribution>& hmm, util::SaveRestoreUtility& sr)
 {
   Log::Fatal << "HMM load not implemented for arbitrary distributions."
       << std::endl;
@@ -113,7 +113,7 @@
 
 template<>
 void LoadHMM(HMM<distribution::DiscreteDistribution>& hmm,
-             utilities::SaveRestoreUtility& sr)
+             util::SaveRestoreUtility& sr)
 {
   std::string type;
   size_t states;
@@ -144,7 +144,7 @@
 
 template<>
 void LoadHMM(HMM<distribution::GaussianDistribution>& hmm,
-             utilities::SaveRestoreUtility& sr)
+             util::SaveRestoreUtility& sr)
 {
   std::string type;
   size_t states;
@@ -179,7 +179,7 @@
 
 template<>
 void LoadHMM(HMM<gmm::GMM<> >& hmm,
-             utilities::SaveRestoreUtility& sr)
+             util::SaveRestoreUtility& sr)
 {
   std::string type;
   size_t states;

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp	2012-10-31 19:03:24 UTC (rev 13800)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp	2012-10-31 19:18:53 UTC (rev 13801)
@@ -26,7 +26,7 @@
 using namespace mlpack;
 using namespace mlpack::hmm;
 using namespace mlpack::distribution;
-using namespace mlpack::utilities;
+using namespace mlpack::util;
 using namespace mlpack::gmm;
 using namespace arma;
 using namespace std;