From 5b85eb566da20bf13990aec6257eccf0bd5de7d2 Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Thu, 21 Nov 2013 18:34:37 +0000
Subject: [PATCH] Add a constructor that allows passing an instantiated
 optimizer.

---
 .../logistic_regression/logistic_regression.hpp  | 13 +++++++++++++
 .../logistic_regression_impl.hpp                 | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/methods/logistic_regression/logistic_regression.hpp b/src/mlpack/methods/logistic_regression/logistic_regression.hpp
index b02ac59f29..bc117b380b 100644
--- a/src/mlpack/methods/logistic_regression/logistic_regression.hpp
+++ b/src/mlpack/methods/logistic_regression/logistic_regression.hpp
@@ -52,6 +52,19 @@ class LogisticRegression
                      const arma::mat& initialPoint,
                      const double lambda = 0);
 
+  /**
+   * Construct the LogisticRegression class with the given labeled training
+   * data.  This will train the model.  This overload takes an already
+   * instantiated optimizer (which holds the LogisticRegressionFunction error
+   * function, which must also be instantiated), so that the optimizer can be
+   * configured before the training is run by this constructor.  The predictors
+   * and responses and initial point are all taken from the error function
+   * contained in the optimizer.
+   *
+   * @param optimizer Instantiated optimizer with instantiated error function.
+   */
+  LogisticRegression(OptimizerType<LogisticRegressionFunction>& optimizer);
+
   //! Return the parameters (the b vector).
   const arma::vec& Parameters() const { return parameters; }
   //! Modify the parameters (the b vector).
diff --git a/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp b/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
index d284fe8e4b..f09305f690 100644
--- a/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
+++ b/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
@@ -45,7 +45,21 @@ LogisticRegression<OptimizerType>::LogisticRegression(
   LearnModel();
 }
 
-template <template<typename> class OptimizerType>
+template<template<typename> class OptimizerType>
+LogisticRegression<OptimizerType>::LogisticRegression(
+    OptimizerType<LogisticRegressionFunction>& optimizer) :
+    predictors(optimizer.Function().Predictors()),
+    responses(optimizer.Function().Responses()),
+    parameters(optimizer.Function().GetInitialPoint()),
+    errorFunction(optimizer.Function()),
+    optimizer(optimizer)
+{
+  Timer::Start("logistic_regression_optimization");
+  const double out = optimizer.Optimize(parameters);
+  Timer::Stop("logistic_regression_optimization");
+}
+
+template<template<typename> class OptimizerType>
 void LogisticRegression<OptimizerType>::Predict(const arma::mat& predictors,
                                                 arma::vec& responses,
                                                 const double decisionBoundary)