Rename hmm to hmmc

acletournel · Apr 2, 2019 · 0d4d068 · 0d4d068
1 parent 5c6b16a
commit 0d4d068
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/sources/ml_doc_populate.cpp b/sources/ml_doc_populate.cpp
@@ -40,7 +40,7 @@ namespace ml_doc
             ml::k_adaboost,
             ml::k_anbc,
             ml::k_dtw,
-            ml::k_hmm,
+            ml::k_hmmc,
             ml::k_softmax,
             ml::k_randforest,
             ml::k_mindist,
@@ -65,15 +65,15 @@ namespace ml_doc
         descriptors[ml::k_adaboost].desc("Adaptive Boosting").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/AdaBoost");
         descriptors[ml::k_anbc].desc("Adaptive Naive Bayes Classifier").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/ANBC");
         descriptors[ml::k_dtw].desc("Dynamic Time Warping").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/DTW");
-        descriptors[ml::k_hmm].desc("Continuous Hidden Markov Model").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/HMM");
+        descriptors[ml::k_hmmc].desc("Continuous Hidden Markov Model").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/HMM");
         descriptors[ml::k_softmax].desc("Softmax Classifier").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/Softmax");
         descriptors[ml::k_randforest].desc("Random Forests").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/RandomForests");
         descriptors[ml::k_mindist].desc("Minimum Distance").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/MinDist");
         descriptors[ml::k_knn].desc("K Nearest Neighbour").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/KNN");
         descriptors[ml::k_gmm].desc("Gaussian Mixture Model").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/GMMClassifier");
         descriptors[ml::k_dtree].desc("Decision Trees").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/DecisionTree");
 
-        for (auto& desc : {&descriptors[ml::k_hmm], &descriptors[ml::k_dtw]})
+        for (auto& desc : {&descriptors[ml::k_hmmc], &descriptors[ml::k_dtw]})
         {
             desc->notes(
                         "add and map messages for time series should be delimited with record messages, e.g. record 1, add 1 40 50, add 1 41 50, record 0"
@@ -496,7 +496,7 @@ namespace ml_doc
         descriptors[ml::k_dtw].insert_message_descriptor(record);
         descriptors[ml::k_dtw].add_message_descriptor(rejection_mode, warping_radius, offset_time_series, constrain_warping_path, enable_z_normalization, enable_trim_training_data);
 
-        //---- ml.hmm
+        //---- ml.hmmc
         valued_message_descriptor<int> model_type(
                                                   "model_type",
                                                   "set the model type used, 0:ERGODIC, 1:LEFTRIGHT",
@@ -536,8 +536,8 @@ namespace ml_doc
                                                       5
                                                       );
 
-        descriptors[ml::k_hmm].insert_message_descriptor(record);
-        descriptors[ml::k_hmm].add_message_descriptor(model_type, delta, max_num_iterations, committee_size, downsample_factor);
+        descriptors[ml::k_hmmc].insert_message_descriptor(record);
+        descriptors[ml::k_hmmc].add_message_descriptor(model_type, delta, max_num_iterations, committee_size, downsample_factor);
 
         //---- ml.softmax
 

diff --git a/sources/ml_ml.cpp b/sources/ml_ml.cpp
@@ -515,7 +515,7 @@ namespace ml
         FLEXT_SETUP(svm);
         FLEXT_SETUP(adaboost);
         FLEXT_SETUP(dtw);
-        FLEXT_SETUP(hmm);
+        FLEXT_SETUP(hmmc);
         FLEXT_SETUP(ann);
         FLEXT_SETUP(linreg);
         FLEXT_SETUP(logreg);

diff --git a/sources/ml_names.h b/sources/ml_names.h
@@ -24,7 +24,7 @@ namespace ml
     const std::string k_adaboost = "ml.adaboost";
     const std::string k_anbc = "ml.anbc";
     const std::string k_dtw = "ml.dtw";
-    const std::string k_hmm = "ml.hmm";
+    const std::string k_hmmc = "ml.hmmc";
     const std::string k_softmax = "ml.softmax";
     const std::string k_randforest = "ml.randforest";
     const std::string k_mindist = "ml.mindist";
@@ -44,7 +44,7 @@ namespace ml
         k_adaboost,
         k_anbc,
         k_dtw,
-        k_hmm,
+        k_hmmc,
         k_softmax,
         k_randforest,
         k_mindist,

diff --git a/sources/ml_setup.cpp b/sources/ml_setup.cpp
@@ -26,7 +26,7 @@ extern "C" {
     void ml0x2esvm_setup();
     void ml0x2eadaboost_setup();
     void ml0x2edtw_setup();
-    void ml0x2ehmm_setup();
+    void ml0x2ehmmc_setup();
     void ml0x2eann_setup();
     void ml0x2elinreg_setup();
     void ml0x2elogreg_setup();
@@ -54,7 +54,7 @@ void ml::setup_all()
     ml0x2esvm_setup();
     ml0x2eadaboost_setup();
     ml0x2edtw_setup();
-    ml0x2ehmm_setup();
+    ml0x2ehmmc_setup();
     ml0x2eann_setup();
     ml0x2elinreg_setup();
     ml0x2elogreg_setup();