[mlpack-git] master: Minor formatting fixes: tabs->spaces, etc. (9a7bf69)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:02:11 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 9a7bf690560cde6b42df4932142555e1ebd737e8
Author: Ryan Curtin <ryan at ratml.org>
Date: Mon Nov 3 16:22:28 2014 +0000
Minor formatting fixes: tabs->spaces, etc.
>---------------------------------------------------------------
9a7bf690560cde6b42df4932142555e1ebd737e8
src/mlpack/core/dists/regression_distribution.cpp | 43 +++++++++++------------
src/mlpack/core/dists/regression_distribution.hpp | 8 ++---
2 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/mlpack/core/dists/regression_distribution.cpp b/src/mlpack/core/dists/regression_distribution.cpp
index 32dc09b..39b29cc 100644
--- a/src/mlpack/core/dists/regression_distribution.cpp
+++ b/src/mlpack/core/dists/regression_distribution.cpp
@@ -13,8 +13,7 @@ using namespace mlpack::distribution;
/**
* Returns a string representation of this object.
*/
-std::string RegressionDistribution::ToString()
- const
+std::string RegressionDistribution::ToString() const
{
std::ostringstream convert;
convert << "HMMRegression [" << this << "]" << std::endl;
@@ -30,41 +29,41 @@ std::string RegressionDistribution::ToString()
}
/**
-* Estimate parameters using provided observation weights
-*
-* @param observations List of observations.
-*/
+ * Estimate parameters using provided observation weights
+ *
+ * @param observations List of observations.
+ */
void RegressionDistribution::Estimate(const arma::mat& observations)
{
- regression::LinearRegression lr(observations.rows(1, observations.n_rows-1),
+ 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());
+ lr.Predict(observations.rows(1, observations.n_rows - 1), fitted);
+ err.Estimate(observations.row(0) - fitted.t());
}
/**
-* Estimate parameters using provided observation weights
-*
-* @param weights probability that given observation is from distribution
-*/
+ * Estimate parameters using provided observation weights.
+ *
+ * @param weights probability that given observation is from distribution
+ */
void RegressionDistribution::Estimate(const arma::mat& observations,
const arma::vec& weights)
{
- regression::LinearRegression lr(observations.rows(1, observations.n_rows-1),
+ 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);
+ lr.Predict(observations.rows(1, observations.n_rows - 1), fitted);
+ err.Estimate(observations.row(0) - fitted.t(), weights);
}
/**
-* Evaluate probability density function of given observation
-*
-* @param observation point to evaluate probability at
-*/
+ * Evaluate probability density function of given observation.
+ *
+ * @param observation point to evaluate probability at
+ */
double RegressionDistribution::Probability(const arma::vec& observation) const
{
arma::vec fitted;
@@ -73,7 +72,7 @@ double RegressionDistribution::Probability(const arma::vec& observation) const
}
void RegressionDistribution::Predict(const arma::mat& points,
- arma::vec& predictions) const
+ arma::vec& predictions) const
{
- rf.Predict(points, predictions);
+ rf.Predict(points, predictions);
}
diff --git a/src/mlpack/core/dists/regression_distribution.hpp b/src/mlpack/core/dists/regression_distribution.hpp
index b236aa0..af13acb 100644
--- a/src/mlpack/core/dists/regression_distribution.hpp
+++ b/src/mlpack/core/dists/regression_distribution.hpp
@@ -44,11 +44,11 @@ class RegressionDistribution
* @param responses Vector of responses (y).
*/
RegressionDistribution(const arma::mat& predictors,
- const arma::vec& responses) :
+ const arma::vec& responses) :
rf(regression::LinearRegression(predictors, responses))
{
- err = GaussianDistribution(1);
- err.Covariance() = rf.ComputeError(predictors, responses);
+ err = GaussianDistribution(1);
+ err.Covariance() = rf.ComputeError(predictors, responses);
}
/**
@@ -88,7 +88,7 @@ class RegressionDistribution
*/
void Predict(const arma::mat& points, arma::vec& predictions) const;
- //! Return the parameters (the b vector).
+ //! Return the parameters (the b vector).
const arma::vec& Parameters() const { return rf.Parameters(); }
//! Return the dimensionality (2) NEED TO FIX THIS
More information about the mlpack-git
mailing list