[mlpack-git] master: Remove Save() and Load() calls. (b51b276)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Mon Jul 13 04:04:46 EDT 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/8b2ca720828224607c70d2b539c43aecf8f4ec32...b4659b668021db631b3c8a48e3d735b513706fdc
>---------------------------------------------------------------
commit b51b276d574061665b1be591e38c5b2ba3d018a7
Author: Ryan Curtin <ryan at ratml.org>
Date: Sun Jul 12 13:28:14 2015 +0000
Remove Save() and Load() calls.
>---------------------------------------------------------------
b51b276d574061665b1be591e38c5b2ba3d018a7
src/mlpack/core/dists/discrete_distribution.cpp | 9 ---------
src/mlpack/core/dists/discrete_distribution.hpp | 6 ------
src/mlpack/core/dists/gaussian_distribution.cpp | 20 --------------------
src/mlpack/core/dists/gaussian_distribution.hpp | 7 -------
src/mlpack/core/dists/laplace_distribution.cpp | 13 -------------
src/mlpack/core/dists/laplace_distribution.hpp | 7 -------
6 files changed, 62 deletions(-)
diff --git a/src/mlpack/core/dists/discrete_distribution.cpp b/src/mlpack/core/dists/discrete_distribution.cpp
index 76bd71f..8441bae 100644
--- a/src/mlpack/core/dists/discrete_distribution.cpp
+++ b/src/mlpack/core/dists/discrete_distribution.cpp
@@ -105,15 +105,6 @@ void DiscreteDistribution::Estimate(const arma::mat& observations,
}
/**
- * Save to SaveRestoreUtility.
- */
-void DiscreteDistribution::Save(util::SaveRestoreUtility& n) const
-{
- n.SaveParameter(probabilities, "probabilities");
- n.SaveParameter(Type(), "type");
-}
-
-/**
* Returns a string representation of this object.
*/
std::string DiscreteDistribution::ToString() const
diff --git a/src/mlpack/core/dists/discrete_distribution.hpp b/src/mlpack/core/dists/discrete_distribution.hpp
index ad1743c..cd158e7 100644
--- a/src/mlpack/core/dists/discrete_distribution.hpp
+++ b/src/mlpack/core/dists/discrete_distribution.hpp
@@ -168,12 +168,6 @@ class DiscreteDistribution
*/
std::string ToString() const;
- /** Save to or Load from SaveRestoreUtility
- */
- void Save(util::SaveRestoreUtility& n) const;
- void Load(const util::SaveRestoreUtility& n) { n.LoadParameter(probabilities, "probabilities"); }
- static std::string const Type() { return "DiscreteDistribution"; }
-
private:
arma::vec probabilities;
};
diff --git a/src/mlpack/core/dists/gaussian_distribution.cpp b/src/mlpack/core/dists/gaussian_distribution.cpp
index 692c62c..0d7eb6c 100644
--- a/src/mlpack/core/dists/gaussian_distribution.cpp
+++ b/src/mlpack/core/dists/gaussian_distribution.cpp
@@ -218,23 +218,3 @@ std::string GaussianDistribution::ToString() const
convert << util::Indent(data.str());
return convert.str();
}
-
-/**
- * Save to SaveRestoreUtility.
- */
-void GaussianDistribution::Save(util::SaveRestoreUtility& sr) const
-{
- sr.SaveParameter(Type(), "type");
- sr.SaveParameter(mean, "mean");
- sr.SaveParameter(covariance, "covariance");
-}
-
-/**
- * Load from SaveRestoreUtility.
- */
-void GaussianDistribution::Load(const util::SaveRestoreUtility& sr)
-{
- sr.LoadParameter(mean, "mean");
- sr.LoadParameter(covariance, "covariance");
- FactorCovariance();
-}
diff --git a/src/mlpack/core/dists/gaussian_distribution.hpp b/src/mlpack/core/dists/gaussian_distribution.hpp
index 8c631fa..2980a3f 100644
--- a/src/mlpack/core/dists/gaussian_distribution.hpp
+++ b/src/mlpack/core/dists/gaussian_distribution.hpp
@@ -158,13 +158,6 @@ class GaussianDistribution
*/
std::string ToString() const;
- /*
- * Save to or Load from SaveRestoreUtility
- */
- void Save(util::SaveRestoreUtility& n) const;
- void Load(const util::SaveRestoreUtility& n);
- static std::string const Type() { return "GaussianDistribution"; }
-
private:
void FactorCovariance();
diff --git a/src/mlpack/core/dists/laplace_distribution.cpp b/src/mlpack/core/dists/laplace_distribution.cpp
index e6a5e02..9bdea59 100644
--- a/src/mlpack/core/dists/laplace_distribution.cpp
+++ b/src/mlpack/core/dists/laplace_distribution.cpp
@@ -89,16 +89,3 @@ std::string LaplaceDistribution::ToString() const
convert << util::Indent(data.str());
return convert.str();
}
-
-/*
- * Save to or Load from SaveRestoreUtility
- */
-void LaplaceDistribution::Save(util::SaveRestoreUtility& sr) const {
- sr.SaveParameter(Type(), "type");
- sr.SaveParameter(mean, "mean");
- sr.SaveParameter(scale, "scale");
-}
-void LaplaceDistribution::Load(const util::SaveRestoreUtility& sr) {
- sr.LoadParameter(mean, "mean");
- sr.LoadParameter(scale, "scale");
-}
diff --git a/src/mlpack/core/dists/laplace_distribution.hpp b/src/mlpack/core/dists/laplace_distribution.hpp
index de2afe0..79f0312 100644
--- a/src/mlpack/core/dists/laplace_distribution.hpp
+++ b/src/mlpack/core/dists/laplace_distribution.hpp
@@ -148,13 +148,6 @@ class LaplaceDistribution
//! Return a string representation of the object.
std::string ToString() const;
- /*
- * Save to or Load from SaveRestoreUtility
- */
- void Save(util::SaveRestoreUtility& n) const;
- void Load(const util::SaveRestoreUtility& n);
- static std::string const Type() { return "LaplaceDistribution"; }
-
private:
//! Mean of the distribution.
arma::vec mean;
More information about the mlpack-git
mailing list