Rename MLP to ANN

acletournel · Apr 1, 2019 · e09244e · e09244e
1 parent ab02179
commit e09244e
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 125 deletions.
diff --git a/sources/ml_base.h b/sources/ml_base.h
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#define ML_VERSION "0.20.2"
+#define ML_VERSION "0.20.3"
 #define ML_NAME "ml-lib"
 #define ML_NAME_PREFIX "ml."
 

diff --git a/sources/ml_doc_populate.cpp b/sources/ml_doc_populate.cpp
@@ -30,7 +30,7 @@ namespace ml_doc
         });
 
         add_class_descriptors(ml::k_regression, {
-            ml::k_mlp,
+            ml::k_ann,
             ml::k_linreg,
             ml::k_logreg
         });
@@ -55,7 +55,7 @@ namespace ml_doc
             ml::k_zerox
         });
 
-        descriptors[ml::k_mlp].desc("Multilayer Perceptron").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/MLP");
+        descriptors[ml::k_ann].desc("Artificial Neural Network").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/MLP");
         descriptors[ml::k_linreg].desc("Linear Regression").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/LinearRegression");
         descriptors[ml::k_logreg].desc("Logistic Regression").url("http://www.nickgillian.com/wiki/pmwiki.php/GRT/LogisticRegression");
         descriptors[ml::k_peak].desc("Peak Detection").url("");
@@ -197,15 +197,15 @@ namespace ml_doc
 
         // Object-specific descriptors
         //-- Regressifiers
-        //---- mlp
+        //---- ann
         valued_message_descriptor<ml::data_type> mode("mode",
-                                                      "set the mode of the MLP, " + std::to_string(ml::LABELLED_CLASSIFICATION) + " for classification, " + std::to_string(ml::LABELLED_REGRESSION) + " for regression",
+                                                      "set the mode of the ANN, " + std::to_string(ml::LABELLED_CLASSIFICATION) + " for classification, " + std::to_string(ml::LABELLED_REGRESSION) + " for regression",
                                                       {ml::LABELLED_CLASSIFICATION, ml::LABELLED_REGRESSION, ml::LABELLED_TIME_SERIES_CLASSIFICATION},
                                                       ml::defaults::data_type
                                                       );
 
 
-        message_descriptor add_mlp(
+        message_descriptor add_ann(
                               "add",
                               "class id followed by n features, <class> <feature 1> <feature 2> etc when in classification mode or N output values followed by M input values when in regression mode (N = num_outputs)",
                                    "1 0.2 0.7 0.3 0.1"
@@ -315,7 +315,7 @@ namespace ml_doc
                                                            );
 
 
-        descriptors[ml::k_mlp].add_message_descriptor(add_mlp, probs, mode, null_rejection, null_rejection_coeff, num_outputs, num_hidden, min_epochs, max_epochs, momentum, gamma, input_activation_function, hidden_activation_function, output_activation_function, rand_training_iterations, use_validation_set, validation_set_size, randomize_training_order);
+        descriptors[ml::k_ann].add_message_descriptor(add_ann, probs, mode, null_rejection, null_rejection_coeff, num_outputs, num_hidden, min_epochs, max_epochs, momentum, gamma, input_activation_function, hidden_activation_function, output_activation_function, rand_training_iterations, use_validation_set, validation_set_size, randomize_training_order);
 
 
         //-- Classifiers

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

diff --git a/sources/ml_names.h b/sources/ml_names.h
@@ -33,7 +33,7 @@ namespace ml
     const std::string k_dtree = "ml.dtree";
     const std::string k_linreg = "ml.linreg";
     const std::string k_logreg = "ml.logreg";
-    const std::string k_mlp = "ml.mlp";
+    const std::string k_ann = "ml.ann";
 
     const std::set<std::string> k_classes =
     {
@@ -53,7 +53,7 @@ namespace ml
         k_dtree,
         k_linreg,
         k_logreg,
-        k_mlp
+        k_ann
     };
 }
 

diff --git a/sources/ml_setup.cpp b/sources/ml_setup.cpp
@@ -27,7 +27,7 @@ extern "C" {
     void ml0x2eadaboost_setup();
     void ml0x2edtw_setup();
     void ml0x2ehmm_setup();
-    void ml0x2emlp_setup();
+    void ml0x2eann_setup();
     void ml0x2elinreg_setup();
     void ml0x2elogreg_setup();
     void ml0x2epeak_setup();
@@ -55,7 +55,7 @@ void ml::setup_all()
     ml0x2eadaboost_setup();
     ml0x2edtw_setup();
     ml0x2ehmm_setup();
-    ml0x2emlp_setup();
+    ml0x2eann_setup();
     ml0x2elinreg_setup();
     ml0x2elogreg_setup();
     ml0x2epeak_setup();