[mlpack-git] master: Merge branch 'bindings' of https://github.com/rcurtin/mlpack into rcurtin-bindings (9390cea)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/981ffa2d67d8fe38df6c699589005835fef710ea...04551164d9950dbdb3738f0c9d87e2d498fd8192

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

commit 9390cea0a2ab3674ad4dfd66f32a3a41d5b140ed
Merge: 981ffa2 48e781b
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Nov 3 09:29:35 2016 -0400

    Merge branch 'bindings' of https://github.com/rcurtin/mlpack into rcurtin-bindings


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

9390cea0a2ab3674ad4dfd66f32a3a41d5b140ed
 src/mlpack/core/util/CMakeLists.txt                |   1 -
 src/mlpack/core/util/cli.cpp                       | 751 ++++++++-------------
 src/mlpack/core/util/cli.hpp                       | 228 ++++---
 src/mlpack/core/util/cli_impl.hpp                  | 233 +++++--
 src/mlpack/core/util/option.hpp                    |  36 +-
 src/mlpack/core/util/param.hpp                     | 314 ++++++++-
 src/mlpack/core/util/prefixedoutstream.hpp         |   2 +-
 src/mlpack/core/util/prefixedoutstream_impl.hpp    |  14 +-
 src/mlpack/methods/adaboost/adaboost_main.cpp      |  56 +-
 src/mlpack/methods/approx_kfn/approx_kfn_main.cpp  |  60 +-
 src/mlpack/methods/cf/cf.cpp                       |   2 +-
 src/mlpack/methods/cf/cf.hpp                       |   2 +-
 src/mlpack/methods/cf/cf_main.cpp                  |  63 +-
 .../methods/decision_stump/decision_stump_main.cpp |  45 +-
 src/mlpack/methods/det/det_main.cpp                |  84 +--
 src/mlpack/methods/emst/emst_main.cpp              |  21 +-
 src/mlpack/methods/fastmks/fastmks_main.cpp        |  55 +-
 src/mlpack/methods/gmm/gmm_generate_main.cpp       |  17 +-
 src/mlpack/methods/gmm/gmm_probability_main.cpp    |  24 +-
 src/mlpack/methods/gmm/gmm_train_main.cpp          |   7 +-
 src/mlpack/methods/hmm/hmm_generate_main.cpp       |  20 +-
 src/mlpack/methods/hmm/hmm_loglik_main.cpp         |   6 +-
 src/mlpack/methods/hmm/hmm_train_main.cpp          |   2 +-
 src/mlpack/methods/hmm/hmm_viterbi_main.cpp        |  17 +-
 .../hoeffding_trees/hoeffding_tree_main.cpp        | 113 ++--
 src/mlpack/methods/kernel_pca/kernel_pca_main.cpp  |  23 +-
 src/mlpack/methods/kmeans/kmeans_main.cpp          |  64 +-
 src/mlpack/methods/lars/lars_main.cpp              |  71 +-
 .../linear_regression/linear_regression_main.cpp   |  80 +--
 .../local_coordinate_coding_main.cpp               |  51 +-
 .../logistic_regression_main.cpp                   |  89 +--
 src/mlpack/methods/lsh/lsh_main.cpp                |  79 ++-
 src/mlpack/methods/mean_shift/mean_shift_main.cpp  |  68 +-
 src/mlpack/methods/mvu/mvu_main.cpp                |  13 +-
 src/mlpack/methods/naive_bayes/nbc_main.cpp        |  50 +-
 src/mlpack/methods/nca/nca_main.cpp                |  30 +-
 src/mlpack/methods/neighbor_search/kfn_main.cpp    |  73 +-
 src/mlpack/methods/neighbor_search/knn_main.cpp    |  73 +-
 src/mlpack/methods/nmf/nmf_main.cpp                |  22 +-
 src/mlpack/methods/pca/pca_main.cpp                |  15 +-
 src/mlpack/methods/perceptron/perceptron_main.cpp  |  66 +-
 .../preprocess/preprocess_binarize_main.cpp        |  17 +-
 .../preprocess/preprocess_describe_main.cpp        |   6 +-
 .../methods/preprocess/preprocess_split_main.cpp   |  69 +-
 src/mlpack/methods/radical/radical_main.cpp        |  57 +-
 .../methods/range_search/range_search_main.cpp     |  31 +-
 src/mlpack/methods/rann/krann_main.cpp             |  49 +-
 src/mlpack/methods/rmva/rmva_main.cpp              |  54 +-
 .../softmax_regression/softmax_regression_main.cpp | 105 +--
 .../methods/sparse_coding/sparse_coding_main.cpp   |  52 +-
 src/mlpack/tests/cli_test.cpp                      | 444 +++++++++++-
 51 files changed, 2165 insertions(+), 1759 deletions(-)

diff --cc src/mlpack/methods/det/det_main.cpp
index 7323d9b,25c5b0c..b25841e
--- a/src/mlpack/methods/det/det_main.cpp
+++ b/src/mlpack/methods/det/det_main.cpp
@@@ -106,12 -112,10 +112,10 @@@ int main(int argc, char *argv[]
          << "(-T) is not specified." << endl;
  
    // Are we training a DET or loading from file?
 -  DTree* tree;
 +  DTree<arma::mat, int>* tree;
-   if (CLI::HasParam("training_file"))
+   if (CLI::HasParam("training"))
    {
-     const string trainSetFile = CLI::GetParam<string>("training_file");
-     arma::mat trainingData;
-     data::Load(trainSetFile, trainingData, true);
+     arma::mat trainingData = std::move(CLI::GetParam<arma::mat>("training"));
  
      // Cross-validation here.
      size_t folds = CLI::GetParam<int>("folds");
@@@ -132,7 -136,8 +136,8 @@@
  
      // Obtain the optimal tree.
      Timer::Start("det_training");
-     tree = Trainer<arma::mat, int>(trainingData, folds, regularization, maxLeafSize, minLeafSize, "");
 -    tree = Trainer(trainingData, folds, regularization, maxLeafSize,
 -        minLeafSize, "");
++    tree = Trainer<arma::mat, int>(trainingData, folds, regularization,
++        maxLeafSize, minLeafSize, "");
      Timer::Stop("det_training");
  
      // Compute training set estimates, if desired.