[mlpack-git] master: Rename Estimate() to Train(). (f1f75c8)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Fri Dec 18 11:43:02 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/5ba11bc90223b55eecd5da4cfbe86c8fc40637a5...df229e45a5bd7842fe019e9d49ed32f13beb6aaa
>---------------------------------------------------------------
commit f1f75c86b0951fd9f63b6f8ef7433c3f3d634bb7
Author: Ryan Curtin <ryan at ratml.org>
Date: Wed Dec 16 21:00:18 2015 +0000
Rename Estimate() to Train().
>---------------------------------------------------------------
f1f75c86b0951fd9f63b6f8ef7433c3f3d634bb7
src/mlpack/core/dists/discrete_distribution.cpp | 8 ++++----
src/mlpack/core/dists/discrete_distribution.hpp | 6 +++---
src/mlpack/core/dists/gaussian_distribution.cpp | 10 +++++-----
src/mlpack/core/dists/gaussian_distribution.hpp | 6 +++---
src/mlpack/core/dists/regression_distribution.cpp | 10 +++++-----
src/mlpack/core/dists/regression_distribution.hpp | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/mlpack/core/dists/discrete_distribution.cpp b/src/mlpack/core/dists/discrete_distribution.cpp
index f68a7d9..ce0faf2 100644
--- a/src/mlpack/core/dists/discrete_distribution.cpp
+++ b/src/mlpack/core/dists/discrete_distribution.cpp
@@ -37,7 +37,7 @@ arma::vec DiscreteDistribution::Random() const
/**
* Estimate the probability distribution directly from the given observations.
*/
-void DiscreteDistribution::Estimate(const arma::mat& observations)
+void DiscreteDistribution::Train(const arma::mat& observations)
{
// Clear old probabilities.
probabilities.zeros();
@@ -52,7 +52,7 @@ void DiscreteDistribution::Estimate(const arma::mat& observations)
// Ensure that the observation is within the bounds.
if (obs >= probabilities.n_elem)
{
- Log::Debug << "DiscreteDistribution::Estimate(): observation " << i
+ Log::Debug << "DiscreteDistribution::Train(): observation " << i
<< " (" << obs << ") is invalid; observation must be in [0, "
<< probabilities.n_elem << "] for this distribution." << std::endl;
}
@@ -72,7 +72,7 @@ void DiscreteDistribution::Estimate(const arma::mat& observations)
* Estimate the probability distribution from the given observations when also
* given probabilities that each observation is from this distribution.
*/
-void DiscreteDistribution::Estimate(const arma::mat& observations,
+void DiscreteDistribution::Train(const arma::mat& observations,
const arma::vec& probObs)
{
// Clear old probabilities.
@@ -88,7 +88,7 @@ void DiscreteDistribution::Estimate(const arma::mat& observations,
// Ensure that the observation is within the bounds.
if (obs >= probabilities.n_elem)
{
- Log::Debug << "DiscreteDistribution::Estimate(): observation " << i
+ Log::Debug << "DiscreteDistribution::Train(): observation " << i
<< " (" << obs << ") is invalid; observation must be in [0, "
<< probabilities.n_elem << "] for this distribution." << std::endl;
}
diff --git a/src/mlpack/core/dists/discrete_distribution.hpp b/src/mlpack/core/dists/discrete_distribution.hpp
index ef8cc55..d45ba99 100644
--- a/src/mlpack/core/dists/discrete_distribution.hpp
+++ b/src/mlpack/core/dists/discrete_distribution.hpp
@@ -134,7 +134,7 @@ class DiscreteDistribution
*
* @param observations List of observations.
*/
- void Estimate(const arma::mat& observations);
+ void Train(const arma::mat& observations);
/**
* Estimate the probability distribution from the given observations, taking
@@ -145,8 +145,8 @@ class DiscreteDistribution
* @param probabilities List of probabilities that each observation is
* actually from this distribution.
*/
- void Estimate(const arma::mat& observations,
- const arma::vec& probabilities);
+ void Train(const arma::mat& observations,
+ const arma::vec& probabilities);
//! Return the vector of probabilities.
const arma::vec& Probabilities() const { return probabilities; }
diff --git a/src/mlpack/core/dists/gaussian_distribution.cpp b/src/mlpack/core/dists/gaussian_distribution.cpp
index 02c69bc..cd9559f 100644
--- a/src/mlpack/core/dists/gaussian_distribution.cpp
+++ b/src/mlpack/core/dists/gaussian_distribution.cpp
@@ -82,7 +82,7 @@ arma::vec GaussianDistribution::Random() const
*
* @param observations List of observations.
*/
-void GaussianDistribution::Estimate(const arma::mat& observations)
+void GaussianDistribution::Train(const arma::mat& observations)
{
if (observations.n_cols > 0)
{
@@ -118,7 +118,7 @@ void GaussianDistribution::Estimate(const arma::mat& observations)
// Ensure that the covariance is positive definite.
if (det(covariance) <= 1e-50)
{
- Log::Debug << "GaussianDistribution::Estimate(): Covariance matrix is not "
+ Log::Debug << "GaussianDistribution::Train(): Covariance matrix is not "
<< "positive definite. Adding perturbation." << std::endl;
double perturbation = 1e-30;
@@ -137,8 +137,8 @@ void GaussianDistribution::Estimate(const arma::mat& observations)
* account the probability of each observation actually being from this
* distribution.
*/
-void GaussianDistribution::Estimate(const arma::mat& observations,
- const arma::vec& probabilities)
+void GaussianDistribution::Train(const arma::mat& observations,
+ const arma::vec& probabilities)
{
if (observations.n_cols > 0)
{
@@ -188,7 +188,7 @@ void GaussianDistribution::Estimate(const arma::mat& observations,
// Ensure that the covariance is positive definite.
if (det(covariance) <= 1e-50)
{
- Log::Debug << "GaussianDistribution::Estimate(): Covariance matrix is not "
+ Log::Debug << "GaussianDistribution::Train(): Covariance matrix is not "
<< "positive definite. Adding perturbation." << std::endl;
double perturbation = 1e-30;
diff --git a/src/mlpack/core/dists/gaussian_distribution.hpp b/src/mlpack/core/dists/gaussian_distribution.hpp
index 88844c3..2b50219 100644
--- a/src/mlpack/core/dists/gaussian_distribution.hpp
+++ b/src/mlpack/core/dists/gaussian_distribution.hpp
@@ -105,15 +105,15 @@ class GaussianDistribution
*
* @param observations List of observations.
*/
- void Estimate(const arma::mat& observations);
+ void Train(const arma::mat& observations);
/**
* Estimate the Gaussian distribution from the given observations, taking into
* account the probability of each observation actually being from this
* distribution.
*/
- void Estimate(const arma::mat& observations,
- const arma::vec& probabilities);
+ void Train(const arma::mat& observations,
+ const arma::vec& probabilities);
/**
* Return the mean.
diff --git a/src/mlpack/core/dists/regression_distribution.cpp b/src/mlpack/core/dists/regression_distribution.cpp
index 7406f91..ff56876 100644
--- a/src/mlpack/core/dists/regression_distribution.cpp
+++ b/src/mlpack/core/dists/regression_distribution.cpp
@@ -15,14 +15,14 @@ using namespace mlpack::distribution;
*
* @param observations List of observations.
*/
-void RegressionDistribution::Estimate(const arma::mat& observations)
+void RegressionDistribution::Train(const arma::mat& observations)
{
regression::LinearRegression lr(observations.rows(1, observations.n_rows - 1),
(observations.row(0)).t(), 0, true);
rf = lr;
arma::vec fitted;
lr.Predict(observations.rows(1, observations.n_rows - 1), fitted);
- err.Estimate(observations.row(0) - fitted.t());
+ err.Train(observations.row(0) - fitted.t());
}
/**
@@ -30,15 +30,15 @@ void RegressionDistribution::Estimate(const arma::mat& observations)
*
* @param weights probability that given observation is from distribution
*/
-void RegressionDistribution::Estimate(const arma::mat& observations,
- const arma::vec& weights)
+void RegressionDistribution::Train(const arma::mat& observations,
+ const arma::vec& weights)
{
regression::LinearRegression lr(observations.rows(1, observations.n_rows - 1),
(observations.row(0)).t(), 0, true, weights);
rf = lr;
arma::vec fitted;
lr.Predict(observations.rows(1, observations.n_rows - 1), fitted);
- err.Estimate(observations.row(0) - fitted.t(), weights);
+ err.Train(observations.row(0) - fitted.t(), weights);
}
/**
diff --git a/src/mlpack/core/dists/regression_distribution.hpp b/src/mlpack/core/dists/regression_distribution.hpp
index e59c086..decfa03 100644
--- a/src/mlpack/core/dists/regression_distribution.hpp
+++ b/src/mlpack/core/dists/regression_distribution.hpp
@@ -78,14 +78,14 @@ class RegressionDistribution
*
* @param observations List of observations.
*/
- void Estimate(const arma::mat& observations);
+ void Train(const arma::mat& observations);
/**
* Estimate parameters using provided observation weights
*
* @param weights probability that given observation is from distribution
*/
- void Estimate(const arma::mat& observations, const arma::vec& weights);
+ void Train(const arma::mat& observations, const arma::vec& weights);
/**
* Evaluate probability density function of given observation
More information about the mlpack-git
mailing list