[mlpack-git] master: Fix duplicate options. (7afd99c)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/59bc0b32630a3ad786706993f4d5e8b087f1c702...0d9a0e263a32b99d8dcf5d2723b3b92c67e669fc

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

commit 7afd99c875a41a3dcab27c5cc8768965a8d8ea34
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Jul 13 10:56:08 2016 -0400

    Fix duplicate options.


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

7afd99c875a41a3dcab27c5cc8768965a8d8ea34
 src/mlpack/methods/pca/pca_main.cpp    | 6 +++---
 src/mlpack/methods/rann/krann_main.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/methods/pca/pca_main.cpp b/src/mlpack/methods/pca/pca_main.cpp
index f2f558c..981eeac 100644
--- a/src/mlpack/methods/pca/pca_main.cpp
+++ b/src/mlpack/methods/pca/pca_main.cpp
@@ -29,7 +29,7 @@ PARAM_STRING_OUT("output_file", "File to save modified dataset to.", "o");
 PARAM_INT_IN("new_dimensionality", "Desired dimensionality of output dataset. "
     "If 0, no dimensionality reduction is performed.", "d", 0);
 PARAM_DOUBLE_IN("var_to_retain", "Amount of variance to retain; should be "
-    "between 0 and 1.  If 1, all variance is retained.  Overrides -d.", "V", 0);
+    "between 0 and 1.  If 1, all variance is retained.  Overrides -d.", "r", 0);
 
 PARAM_FLAG("scale", "If set, the data will be scaled before running PCA, such "
     "that the variance of each feature is 1.", "s");
@@ -53,8 +53,8 @@ void RunPCA(arma::mat& dataset,
   if (varToRetain != 0)
   {
     if (newDimension != 0)
-      Log::Warn << "New dimensionality (-d) ignored because -V was specified."
-          << endl;
+      Log::Warn << "New dimensionality (-d) ignored because --var_to_retain "
+          << "(-r) was specified." << endl;
 
     varRetained = p.Apply(dataset, varToRetain);
   }
diff --git a/src/mlpack/methods/rann/krann_main.cpp b/src/mlpack/methods/rann/krann_main.cpp
index b8289dd..9950cd2 100644
--- a/src/mlpack/methods/rann/krann_main.cpp
+++ b/src/mlpack/methods/rann/krann_main.cpp
@@ -75,7 +75,7 @@ PARAM_INT_IN("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
 
 // Search options.
 PARAM_DOUBLE_IN("tau", "The allowed rank-error in terms of the percentile of "
-             "the data.", "t", 5);
+             "the data.", "T", 5);
 PARAM_DOUBLE_IN("alpha", "The desired success probability.", "a", 0.95);
 PARAM_FLAG("naive", "If true, sampling will be done without using a tree.",
            "N");