[mlpack-svn] r16051 - mlpack/trunk/src/mlpack/methods/logistic_regression

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Wed Nov 20 11:44:30 2013
New Revision: 16051

Log:
Make predictors and responses const.


Modified:
   mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression.hpp
   mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp

Modified: mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression.hpp	Wed Nov 20 11:44:30 2013
@@ -32,8 +32,8 @@
    * @param responses Outputs resulting from input training variables.
    * @param lambda L2-regularization parameter.
    */
-  LogisticRegression(arma::mat& predictors,
-                     arma::vec& responses,
+  LogisticRegression(const arma::mat& predictors,
+                     const arma::vec& responses,
                      const double lambda = 0);
 
   /**
@@ -47,8 +47,8 @@
    * @param initialPoint Initial model to train with.
    * @param lambda L2-regularization parameter.
    */
-  LogisticRegression(arma::mat& predictors,
-                     arma::vec& responses,
+  LogisticRegression(const arma::mat& predictors,
+                     const arma::vec& responses,
                      const arma::mat& initialPoint,
                      const double lambda = 0);
 
@@ -77,8 +77,8 @@
 
  private:
   arma::vec parameters;
-  arma::mat& predictors;
-  arma::vec& responses;
+  const arma::mat& predictors;
+  const arma::vec& responses;
   LogisticRegressionFunction errorFunction;
   OptimizerType<LogisticRegressionFunction> optimizer;
   double lambda;

Modified: mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_impl.hpp	Wed Nov 20 11:44:30 2013
@@ -16,8 +16,8 @@
 
 template<template<typename> class OptimizerType>
 LogisticRegression<OptimizerType>::LogisticRegression(
-    arma::mat& predictors,
-    arma::vec& responses,
+    const arma::mat& predictors,
+    const arma::vec& responses,
     const double lambda) :
     predictors(predictors),
     responses(responses),
@@ -30,8 +30,8 @@
 
 template<template<typename> class OptimizerType>
 LogisticRegression<OptimizerType>::LogisticRegression(
-    arma::mat& predictors,
-    arma::vec& responses,
+    const arma::mat& predictors,
+    const arma::vec& responses,
     const arma::mat& initialPoint,
     const double lambda) :
     predictors(predictors),
@@ -46,19 +46,10 @@
 template <template<typename> class OptimizerType>
 double LogisticRegression<OptimizerType>::LearnModel()
 {
-  //add rows of ones to predictors
-  arma::rowvec ones;
-  ones.ones(predictors.n_cols);
-  predictors.insert_rows(0, ones);
-
-  double out;
   Timer::Start("logistic_regression_optimization");
-  out = optimizer.Optimize(parameters);
+  const double out = optimizer.Optimize(parameters);
   Timer::Stop("logistic_regression_optimization");
 
-  //shed the added rows
-  predictors.shed_row(0);
-
   return out;
 }