[mlpack] 30/58: Remove trailing spaces thanks to vimrc, and fix comment correctness.
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Tue Sep 9 13:19:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to branch svn-trunk
in repository mlpack.
commit a00019c7da2d814374dc7ad249b998c7d34cae54
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date: Wed Aug 20 19:58:10 2014 +0000
Remove trailing spaces thanks to vimrc, and fix comment correctness.
git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17085 9d5b8971-822b-0410-80eb-d18c1038ef23
---
src/mlpack/methods/gmm/gmm.hpp | 14 +++++++-------
src/mlpack/methods/gmm/gmm_impl.hpp | 20 +++++++++-----------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/mlpack/methods/gmm/gmm.hpp b/src/mlpack/methods/gmm/gmm.hpp
index 3de507b..2437348 100644
--- a/src/mlpack/methods/gmm/gmm.hpp
+++ b/src/mlpack/methods/gmm/gmm.hpp
@@ -77,14 +77,14 @@ class GMM
size_t gaussians;
//! The dimensionality of the model.
size_t dimensionality;
-
+
//! Vector of Gaussians
std::vector<distribution::GaussianDistribution> dists;
-
+
//! Legacy member data, not used.
std::vector<arma::vec> means;
std::vector<arma::mat> covariances;
-
+
//! Vector of a priori weights for each Gaussian.
arma::vec weights;
@@ -214,7 +214,7 @@ class GMM
* @param SaveRestoreUtility object to save to.
*/
void Save(util::SaveRestoreUtility& sr) const;
-
+
//! Return the number of gaussians in the model.
size_t Gaussians() const { return gaussians; }
//! Modify the number of gaussians in the model. Careful! You will have to
@@ -231,14 +231,14 @@ class GMM
* Return a const reference to a component distribution.
*
* @param i index of component.
- */
+ */
const distribution::GaussianDistribution& Component(size_t i) const {
return dists[i]; }
/**
* Return a reference to a component distribution.
*
* @param i index of component.
- */
+ */
distribution::GaussianDistribution& Component(size_t i) { return dists[i]; }
//! Functions from earlier releases give errors
@@ -382,7 +382,7 @@ class GMM
* Returns a string representation of this object.
*/
std::string ToString() const;
-
+
/**
* Returns a string indicating the type.
*/
diff --git a/src/mlpack/methods/gmm/gmm_impl.hpp b/src/mlpack/methods/gmm/gmm_impl.hpp
index 0d58de7..3fb9f45 100644
--- a/src/mlpack/methods/gmm/gmm_impl.hpp
+++ b/src/mlpack/methods/gmm/gmm_impl.hpp
@@ -33,8 +33,7 @@ GMM<FittingType>::GMM(const size_t gaussians, const size_t dimensionality) :
localFitter(FittingType()),
fitter(localFitter)
{
- // Set weights to 0. Technically this model is still valid, but
- // only barely.
+ // Set equal weights. Technically this model is still valid, but only barely.
weights.fill(1.0 / gaussians);
}
@@ -58,12 +57,11 @@ GMM<FittingType>::GMM(const size_t gaussians,
weights(gaussians),
fitter(fitter)
{
- // Set weights to 0. Technically this model is still valid, but
- // only barely.
+ // Set equal weights. Technically this model is still valid, but only barely.
weights.fill(1.0 / gaussians);
}
-
+
// Copy constructor.
template<typename FittingType>
template<typename OtherFittingType>
@@ -132,7 +130,7 @@ void GMM<FittingType>::Save(const std::string& filename) const
Log::Warn << "GMM::Save(): error saving to '" << filename << "'.\n";
}
-
+
// Save a GMM to a SaveRestoreUtility.
template<typename FittingType>
void GMM<FittingType>::Save(util::SaveRestoreUtility& sr) const
@@ -149,7 +147,7 @@ void GMM<FittingType>::Save(util::SaveRestoreUtility& sr) const
std::stringstream o;
o << i;
std::string gaussianName = "gaussian" + o.str();
-
+
// Now save them.
dists[i].Save(child);
sr.AddChild(child, gaussianName);
@@ -163,7 +161,7 @@ void GMM<FittingType>::Load(const util::SaveRestoreUtility& sr)
sr.LoadParameter(gaussians, "gaussians");
sr.LoadParameter(dimensionality, "dimensionality");
sr.LoadParameter(weights, "weights");
-
+
// We need to do a little error checking here.
if (weights.n_elem != gaussians)
{
@@ -171,9 +169,9 @@ void GMM<FittingType>::Load(const util::SaveRestoreUtility& sr)
<< " gaussians but weights vector only contains " << weights.n_elem
<< " elements!" << std::endl;
}
-
+
dists.resize(gaussians);
-
+
for (size_t i = 0; i < gaussians; ++i)
{
std::stringstream o;
@@ -193,7 +191,7 @@ double GMM<FittingType>::Probability(const arma::vec& observation) const
double sum = 0;
for (size_t i = 0; i < gaussians; i++)
sum += weights[i] * dists[i].Probability(observation);
-
+
return sum;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git
More information about the debian-science-commits
mailing list