Don't hold lambda in LogisticRegression because it isn't necessary. Also make
predictors and responses const because we don't need to modify them.
This commit is contained in:
@@ -58,9 +58,9 @@ class LogisticRegression
|
||||
arma::vec& Parameters() { return parameters; }
|
||||
|
||||
//! Return the lambda value for L2-regularization.
|
||||
const double& Lambda() const { return lambda; }
|
||||
const double& Lambda() const { return errorFunction.Lambda(); }
|
||||
//! Modify the lambda value for L2-regularization.
|
||||
double& Lambda() { return lambda; }
|
||||
double& Lambda() { return errorFunction().Lambda(); }
|
||||
|
||||
double LearnModel();
|
||||
|
||||
@@ -76,12 +76,17 @@ class LogisticRegression
|
||||
double ComputeError(arma::mat& predictors, const arma::vec& responses);
|
||||
|
||||
private:
|
||||
arma::vec parameters;
|
||||
//! Matrix of predictor points (X).
|
||||
const arma::mat& predictors;
|
||||
//! Vector of responses (y).
|
||||
const arma::vec& responses;
|
||||
//! Vector of trained parameters.
|
||||
arma::vec parameters;
|
||||
|
||||
//! Instantiated error function that will be optimized.
|
||||
LogisticRegressionFunction errorFunction;
|
||||
//! Instantiated optimizer.
|
||||
OptimizerType<LogisticRegressionFunction> optimizer;
|
||||
double lambda;
|
||||
};
|
||||
|
||||
}; // namespace regression
|
||||
|
||||
@@ -22,8 +22,7 @@ LogisticRegression<OptimizerType>::LogisticRegression(
|
||||
predictors(predictors),
|
||||
responses(responses),
|
||||
errorFunction(LogisticRegressionFunction(predictors, responses, lambda)),
|
||||
optimizer(OptimizerType<LogisticRegressionFunction>(errorFunction)),
|
||||
lambda(lambda)
|
||||
optimizer(OptimizerType<LogisticRegressionFunction>(errorFunction))
|
||||
{
|
||||
parameters.zeros(predictors.n_rows + 1);
|
||||
}
|
||||
@@ -37,8 +36,7 @@ LogisticRegression<OptimizerType>::LogisticRegression(
|
||||
predictors(predictors),
|
||||
responses(responses),
|
||||
errorFunction(LogisticRegressionFunction(predictors, responses)),
|
||||
optimizer(OptimizerType<LogisticRegressionFunction>(errorFunction)),
|
||||
lambda(lambda)
|
||||
optimizer(OptimizerType<LogisticRegressionFunction>(errorFunction))
|
||||
{
|
||||
parameters.zeros(predictors.n_rows + 1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user