From e3abd2c7018bd66ba6de9655cfdac7325b19433d Mon Sep 17 00:00:00 2001
From: Rob West <rob@xtelinco.net>
Date: Wed, 13 Jun 2018 12:35:21 +0100
Subject: [PATCH 1/2] Return the final objective of the trained model

---
 .../methods/logistic_regression/logistic_regression.hpp   | 6 ++++--
 .../logistic_regression/logistic_regression_impl.hpp      | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/methods/logistic_regression/logistic_regression.hpp b/src/mlpack/methods/logistic_regression/logistic_regression.hpp
index 6214c4030c..11ea3ca41a 100644
--- a/src/mlpack/methods/logistic_regression/logistic_regression.hpp
+++ b/src/mlpack/methods/logistic_regression/logistic_regression.hpp
@@ -125,9 +125,10 @@ class LogisticRegression
    * @tparam OptimizerType Type of optimizer to use to train the model.
    * @param predictors Input training variables.
    * @param responses Outputs results from input training variables.
+   * @return The final objective of the trained model (NaN or Inf on error)
    */
   template<typename OptimizerType = mlpack::optimization::L_BFGS>
-  void Train(const MatType& predictors,
+  double Train(const MatType& predictors,
              const arma::Row<size_t>& responses);
 
   /**
@@ -145,9 +146,10 @@ class LogisticRegression
    * @param predictors Input training variables.
    * @param responses Outputs results from input training variables.
    * @param optimizer Instantiated optimizer with instantiated error function.
+   * @return The final objective of the trained model (NaN or Inf on error)
    */
   template<typename OptimizerType>
-  void Train(const MatType& predictors,
+  double Train(const MatType& predictors,
              const arma::Row<size_t>& responses,
              OptimizerType& optimizer);
 
diff --git a/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp b/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
index 15d8c3dee8..1973806fad 100644
--- a/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
+++ b/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
@@ -68,16 +68,16 @@ LogisticRegression<MatType>::LogisticRegression(
 
 template<typename MatType>
 template<typename OptimizerType>
-void LogisticRegression<MatType>::Train(const MatType& predictors,
+double LogisticRegression<MatType>::Train(const MatType& predictors,
                                         const arma::Row<size_t>& responses)
 {
   OptimizerType optimizer;
-  Train(predictors, responses, optimizer);
+  return Train(predictors, responses, optimizer);
 }
 
 template<typename MatType>
 template<typename OptimizerType>
-void LogisticRegression<MatType>::Train(
+double LogisticRegression<MatType>::Train(
     const MatType& predictors,
     const arma::Row<size_t>& responses,
     OptimizerType& optimizer)
@@ -93,6 +93,8 @@ void LogisticRegression<MatType>::Train(
 
   Log::Info << "LogisticRegression::LogisticRegression(): final objective of "
       << "trained model is " << out << "." << std::endl;
+
+  return out;
 }
 
 template<typename MatType>

From a0c6d0de2add2d11372f6187b678064d13c197ea Mon Sep 17 00:00:00 2001
From: Rob West <rob@xtelinco.net>
Date: Wed, 13 Jun 2018 19:37:06 +0100
Subject: [PATCH 2/2] Prod Travis