[mlpack-svn] r16014 - mlpack/trunk/src/mlpack/methods/logistic_regression
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Nov 11 12:14:31 EST 2013
Author: rcurtin
Date: Mon Nov 11 12:14:30 2013
New Revision: 16014
Log:
Rename LogisticRegressionFunction to LogisticFunction.
Added:
mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_function.hpp
- copied, changed from r16011, /mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function.hpp
mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_function_impl.hpp
- copied, changed from r16011, /mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function_impl.hpp
Removed:
mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function.hpp
mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function_impl.hpp
Modified:
mlpack/trunk/src/mlpack/methods/logistic_regression/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression.hpp
Modified: mlpack/trunk/src/mlpack/methods/logistic_regression/CMakeLists.txt
==============================================================================
--- mlpack/trunk/src/mlpack/methods/logistic_regression/CMakeLists.txt (original)
+++ mlpack/trunk/src/mlpack/methods/logistic_regression/CMakeLists.txt Mon Nov 11 12:14:30 2013
@@ -2,10 +2,10 @@
# Anything not in this list will not be compiled into the output library
# Do not include test programs here
set(SOURCES
+ logistic_function.hpp
+ logistic_function_impl.hpp
logistic_regression.hpp
logistic_regression_impl.hpp
- logistic_regression_function.hpp
- logistic_regression_function_impl.hpp
)
# add directory name to sources
Copied: mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_function.hpp (from r16011, /mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function.hpp)
==============================================================================
--- /mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function.hpp (original)
+++ mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_function.hpp Mon Nov 11 12:14:30 2013
@@ -3,25 +3,25 @@
* @author Sumedh Ghaisas
*
* Implementation of the logistic regression function, which is meant to be
- * optimized by a separate optimizer class that takes LogisticRegressionFunction
+ * optimized by a separate optimizer class that takes LogisticFunction
* as its FunctionType class.
*/
-#ifndef __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_REGRESSION_FUNCTION_HPP
-#define __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_REGRESSION_FUNCTION_HPP
+#ifndef __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_FUNCTION_HPP
+#define __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_FUNCTION_HPP
#include <mlpack/core.hpp>
namespace mlpack {
namespace regression {
-class LogisticRegressionFunction
+class LogisticFunction
{
public:
- LogisticRegressionFunction(arma::mat& predictors,
+ LogisticFunction(arma::mat& predictors,
arma::vec& responses,
const double lambda = 0);
- LogisticRegressionFunction(arma::mat& predictors,
+ LogisticFunction(arma::mat& predictors,
arma::vec& responses,
const arma::mat& initialPoint,
const double lambda = 0);
@@ -77,4 +77,4 @@
}; // namespace regression
}; // namespace mlpack
-#endif // __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_REGRESSION_FUNCTION_HPP
+#endif // __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_FUNCTION_HPP
Copied: mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_function_impl.hpp (from r16011, /mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function_impl.hpp)
==============================================================================
--- /mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_regression_function_impl.hpp (original)
+++ mlpack/trunk/src/mlpack/methods/logistic_regression/logistic_function_impl.hpp Mon Nov 11 12:14:30 2013
@@ -2,10 +2,10 @@
* @file logistic_regression_function_impl.hpp
* @author Sumedh Ghaisas
*
- * Implementation of hte LogisticRegressionFunction class.
+ * Implementation of hte LogisticFunction class.
*/
-#ifndef __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_REGRESSION_FUNCTION_IMPL_HPP
-#define __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_REGRESSION_FUNCTION_IMPL_HPP
+#ifndef __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_FUNCTION_IMPL_HPP
+#define __MLPACK_METHODS_LOGISTIC_REGRESSION_LOGISTIC_FUNCTION_IMPL_HPP
// In case it hasn't been done yet.
#include "logistic_regression_function.hpp"
@@ -13,7 +13,7 @@
namespace mlpack {
namespace regression {
-LogisticRegressionFunction::LogisticRegressionFunction(
+LogisticFunction::LogisticFunction(
arma::mat& predictors,
arma::vec& responses,
const double lambda) :
@@ -24,7 +24,7 @@
initialPoint = arma::zeros<arma::mat>(predictors.n_rows + 1, 1);
}
-LogisticRegressionFunction::LogisticRegressionFunction(
+LogisticFunction::LogisticFunction(
arma::mat& predictors,
arma::vec& responses,
const arma::mat& initialPoint,
@@ -39,14 +39,14 @@
this->initialPoint = arma::zeros<arma::mat>(predictors.n_rows + 1,1);
}
-arma::vec LogisticRegressionFunction::getSigmoid(const arma::vec& values) const
+arma::vec LogisticFunction::getSigmoid(const arma::vec& values) const
{
arma::vec out = arma::ones<arma::vec>(values.n_rows,1) /
(arma::ones<arma::vec>(values.n_rows,1) + arma::exp(-values));
return out;
}
-double LogisticRegressionFunction::Evaluate(
+double LogisticFunction::Evaluate(
const arma::mat& predictors,
const arma::vec& responses,
const arma::mat& values) const
@@ -69,7 +69,7 @@
predictors.n_cols + regularization;
}
-void LogisticRegressionFunction::Gradient(
+void LogisticFunction::Gradient(
const arma::mat& values,
arma::mat& gradient)
{
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 Mon Nov 11 12:14:30 2013
@@ -11,7 +11,7 @@
#include <mlpack/core.hpp>
#include <mlpack/core/optimizers/lbfgs/lbfgs.hpp>
-#include "logistic_regression_function.hpp"
+#include "logistic_function.hpp"
namespace mlpack {
namespace regression {
More information about the mlpack-svn
mailing list