[mlpack-svn] r12284 - mlpack/trunk/src/mlpack/methods/hmm

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

Author: rcurtin
Date: 2012-04-10 14:47:17 -0400 (Tue, 10 Apr 2012)
New Revision: 12284

Modified:
   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_impl.hpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
Log:
Use GMM<> not GMM, because it's now a templated class.


Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp	2012-04-10 18:47:01 UTC (rev 12283)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp	2012-04-10 18:47:17 UTC (rev 12284)
@@ -99,7 +99,7 @@
   }
   else if (type == "gmm")
   {
-    HMM<GMM> hmm(1, GMM(1, 1));
+    HMM<GMM<> > hmm(1, GMM<>(1, 1));
 
     LoadHMM(hmm, sr);
 

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp	2012-04-10 18:47:01 UTC (rev 12283)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp	2012-04-10 18:47:17 UTC (rev 12284)
@@ -78,7 +78,7 @@
   }
   else if (type == "gmm")
   {
-    HMM<GMM> hmm(1, GMM(1, 1));
+    HMM<GMM<> > hmm(1, GMM<>(1, 1));
 
     LoadHMM(hmm, sr);
 

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp	2012-04-10 18:47:01 UTC (rev 12283)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp	2012-04-10 18:47:17 UTC (rev 12284)
@@ -294,7 +294,7 @@
   else if (type == "gmm")
   {
     // Create HMM object.
-    HMM<GMM> hmm(1, GMM(1, 1));
+    HMM<GMM<> > hmm(1, GMM<>(1, 1));
 
     // Do we have a model to load?
     size_t dimensionality = 0;
@@ -321,7 +321,8 @@
         Log::Fatal << "Invalid number of gaussians (" << gaussians << "); must "
             << "be greater than or equal to 1." << endl;
 
-      hmm = HMM<GMM>(size_t(states), GMM(size_t(gaussians), dimensionality));
+      hmm = HMM<GMM<> >(size_t(states), GMM<>(size_t(gaussians),
+          dimensionality));
     }
 
     // Verify dimensionality of data.

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp	2012-04-10 18:47:01 UTC (rev 12283)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_util_impl.hpp	2012-04-10 18:47:17 UTC (rev 12284)
@@ -69,7 +69,7 @@
 }
 
 template<>
-void SaveHMM(const HMM<gmm::GMM>& hmm,
+void SaveHMM(const HMM<gmm::GMM<> >& hmm,
              utilities::SaveRestoreUtility& sr)
 {
   std::string type = "gmm";
@@ -178,7 +178,7 @@
 }
 
 template<>
-void LoadHMM(HMM<gmm::GMM>& hmm,
+void LoadHMM(HMM<gmm::GMM<> >& hmm,
              utilities::SaveRestoreUtility& sr)
 {
   std::string type;
@@ -197,7 +197,7 @@
   sr.LoadParameter(hmm.Transition(), "hmm_transition");
 
   // Now each emission distribution.
-  hmm.Emission().resize(states, gmm::GMM(1, 1));
+  hmm.Emission().resize(states, gmm::GMM<>(1, 1));
   for (size_t i = 0; i < states; ++i)
   {
     std::stringstream s;
@@ -213,7 +213,8 @@
     size_t dimensionality = meanzero.n_elem;
 
     // Initialize GMM correctly.
-    hmm.Emission()[i] = gmm::GMM(gaussians, dimensionality);
+    hmm.Emission()[i].Gaussians() = gaussians;
+    hmm.Emission()[i].Dimensionality() = dimensionality;
 
     for (size_t g = 0; g < gaussians; ++g)
     {

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp	2012-04-10 18:47:01 UTC (rev 12283)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp	2012-04-10 18:47:17 UTC (rev 12284)
@@ -82,7 +82,7 @@
   }
   else if (type == "gmm")
   {
-    HMM<GMM> hmm(1, GMM(1, 1));
+    HMM<GMM<> > hmm(1, GMM<>(1, 1));
 
     LoadHMM(hmm, sr);