[mlpack-svn] r10852 - mlpack/trunk/src/mlpack/methods/hmm/distributions

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2011-12-16 09:32:43 -0500 (Fri, 16 Dec 2011)
New Revision: 10852

Modified:
   mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.cpp
   mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp
Log:
Give direct access to discrete distribution probability vector.


Modified: mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.cpp	2011-12-16 14:32:05 UTC (rev 10851)
+++ mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.cpp	2011-12-16 14:32:43 UTC (rev 10852)
@@ -79,18 +79,3 @@
   else
     probabilities.fill(1 / probabilities.n_elem); // Force normalization.
 }
-
-/**
- * Set the vector of probabilities correctly.
- */
-void DiscreteDistribution::Probabilities(const arma::vec& probabilities)
-{
-  double sum = accu(probabilities);
-  if (sum > 0)
-    this->probabilities = probabilities / sum;
-  else
-  {
-    this->probabilities.set_size(probabilities.n_elem);
-    this->probabilities.fill(1 / probabilities.n_elem);
-  }
-}

Modified: mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp	2011-12-16 14:32:05 UTC (rev 10851)
+++ mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp	2011-12-16 14:32:43 UTC (rev 10852)
@@ -124,16 +124,11 @@
   void Estimate(const arma::mat& observations,
                 const arma::vec& probabilities);
 
-  /**
-   * Return the vector of probabilities.
-   */
+  //! Return the vector of probabilities.
   const arma::vec& Probabilities() const { return probabilities; }
+  //! Modify the vector of probabilities.
+  arma::vec& Probabilities() { return probabilities; }
 
-  /**
-   * Set the vector of probabilities correctly.  The vector will be normalized.
-   */
-  void Probabilities(const arma::vec& probabilities);
-
  private:
   arma::vec probabilities;
 };