[mlpack-git] master: Standardize options. (f601e99)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Mon Dec 21 13:26:37 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/09cbc6e13aa3cb8a7c4ea6d2e1612977a40c6be7...be72510a765362f86782a8892f0e979aaa4a9f62

>---------------------------------------------------------------

commit f601e99f7d4d2a248521fdc73d3e1887b8eb2fe7
Author: ryan <ryan at ratml.org>
Date:   Mon Dec 21 12:42:35 2015 -0500

    Standardize options.


>---------------------------------------------------------------

f601e99f7d4d2a248521fdc73d3e1887b8eb2fe7
 .../logistic_regression/logistic_regression_main.cpp   | 10 +++++-----
 .../softmax_regression/softmax_regression_main.cpp     | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp b/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp
index f4f5c12..c72b5e2 100644
--- a/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp
+++ b/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp
@@ -72,14 +72,14 @@ PARAM_STRING("optimizer", "Optimizer to use for training ('lbfgs' or 'sgd').",
     "O", "lbfgs");
 PARAM_DOUBLE("tolerance", "Convergence tolerance for optimizer.", "e", 1e-10);
 PARAM_INT("max_iterations", "Maximum iterations for optimizer (0 indicates no "
-    "limit).", "M", 10000);
+    "limit).", "n", 10000);
 PARAM_DOUBLE("step_size", "Step size for SGD optimizer.", "s", 0.01);
 
 // Model loading/saving.
-PARAM_STRING("input_model", "File containing existing model (parameters).", "i",
-    "");
-PARAM_STRING("output_model", "File to save trained logistic regression model "
-    "to.", "m", "");
+PARAM_STRING("input_model_file", "File containing existing model (parameters).",
+    "m", "");
+PARAM_STRING("output_model_file", "File to save trained logistic regression "
+    "model to.", "M", "");
 
 // Testing.
 PARAM_STRING("test_file", "File containing test dataset.", "T", "");
diff --git a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
index 51c37ba..af78bd2 100644
--- a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
+++ b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
@@ -41,10 +41,10 @@ PARAM_STRING("labels_file", "A file containing labels (0 or 1) for the points "
     "in the training set (y). The labels must order as a row", "l", "");
 
 // Model loading/saving.
-PARAM_STRING("input_model", "File containing existing model (parameters).", "i",
-    "");
-PARAM_STRING("output_model", "File to save trained logistic regression model "
-    "to.", "m", "");
+PARAM_STRING("input_model_file", "File containing existing model (parameters).",
+    "m", "");
+PARAM_STRING("output_model_file", "File to save trained softmax regression "
+    "model to.", "M", "");
 
 // Testing.
 PARAM_STRING("test_data", "File containing test dataset.", "T", "");
@@ -53,12 +53,12 @@ PARAM_STRING("predictions_file", "File to save predictions for test dataset "
 PARAM_STRING("test_labels", "File containing test labels.", "L", "");
 
 // Softmax configuration options.
-PARAM_INT("max_iterations", "Maximum number of iterations before "
-          "terminates.", "M", 400);
+PARAM_INT("max_iterations", "Maximum number of iterations before termination.",
+    "n", 400);
 
-PARAM_INT("number_of_classes", "Number of classes for classification, "
-          "if you do not specify, it will measure it out automatic",
-          "n", 0);
+PARAM_INT("number_of_classes", "Number of classes for classification; if "
+    "unspecified (or 0), the number of classes found in the labels will be "
+    "used.", "c", 0);
 
 PARAM_DOUBLE("lambda", "L2-regularization constant", "r", 0.0001);
 



More information about the mlpack-git mailing list