[mlpack] 184/207: Add minor changes

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository mlpack.

commit 41cd00cde63c7fa4886c639b9b25fa56dcc2a03a
Author: Kirill Mishchenko <ki.mishchenko at gmail.com>
Date:   Thu Mar 16 07:35:00 2017 +0500

    Add minor changes
---
 src/mlpack/methods/softmax_regression/softmax_regression.hpp      | 3 ++-
 src/mlpack/methods/softmax_regression/softmax_regression_main.cpp | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/methods/softmax_regression/softmax_regression.hpp b/src/mlpack/methods/softmax_regression/softmax_regression.hpp
index 8249c0a..1262634 100644
--- a/src/mlpack/methods/softmax_regression/softmax_regression.hpp
+++ b/src/mlpack/methods/softmax_regression/softmax_regression.hpp
@@ -113,7 +113,8 @@ class SoftmaxRegression
    * calculates the probabilities for every class, given a data point. It then
    * chooses the class which has the highest probability among all.
    *
-   * This method is deprecated -- you should use Classify() instead.
+   * This method is deprecated and will be removed in mlpack 3.0.0. You should
+   * use Classify() instead.
    *
    * @param testData Matrix of data points for which predictions are to be made.
    * @param predictions Vector to store the predictions in.
diff --git a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
index 452bf3f..a9ff475 100644
--- a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
+++ b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
@@ -85,7 +85,7 @@ size_t CalculateNumberOfClasses(const size_t numClasses,
 
 // Test the accuracy of the model.
 template<typename Model>
-void TestPredictAcc(const string& testFile,
+void TestClassifyAcc(const string& testFile,
                     const string& predictionsFile,
                     const string& testLabels,
                     const size_t numClasses,
@@ -141,7 +141,7 @@ int main(int argc, char** argv)
                                             inputModelFile,
                                             maxIterations);
 
-  TestPredictAcc(CLI::GetParam<string>("test_data"),
+  TestClassifyAcc(CLI::GetParam<string>("test_data"),
                  CLI::GetParam<string>("predictions_file"),
                  CLI::GetParam<string>("test_labels"),
                  sm->NumClasses(), *sm);
@@ -167,7 +167,7 @@ size_t CalculateNumberOfClasses(const size_t numClasses,
 }
 
 template<typename Model>
-void TestPredictAcc(const string& testFile,
+void TestClassifyAcc(const string& testFile,
                     const string& predictionsFile,
                     const string& testLabelsFile,
                     size_t numClasses,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git