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

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

Author: rcurtin
Date: 2011-11-16 12:59:32 -0500 (Wed, 16 Nov 2011)
New Revision: 10295

Modified:
   mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp
Log:
Add simple constructor and then make sure that every constructor normalizes the
distribution.


Modified: mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp	2011-11-16 16:35:31 UTC (rev 10294)
+++ mlpack/trunk/src/mlpack/methods/hmm/distributions/discrete_distribution.hpp	2011-11-16 17:59:32 UTC (rev 10295)
@@ -42,10 +42,20 @@
    * @param numObservations Number of possible observations this distribution
    *    can have.
    */
-  DiscreteDistribution(size_t numObservations) : probabilities(numObservations)
+  DiscreteDistribution(size_t numObservations) :
+      probabilities(arma::ones<arma::vec>(numObservations) / numObservations)
   { /* nothing to do */ }
 
   /**
+   * Define the discrete distribution as having the given probabilities for each
+   * observation.
+   *
+   * @param probabilities Probabilities of each possible observation.
+   */
+  DiscreteDistribution(const arma::vec& probabilities) :
+      probabilities(probabilities) { /* nothing to do */ }
+
+  /**
    * Return the probability of the given observation.  If the observation is
    * greater than the number of possible observations, then a crash will
    * probably occur -- bounds checking is not performed.