[mlpack] 96/207: Switch to arma::Col<size_t>.

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository mlpack.

commit 6fa43e086139f5c172719dffda6dbecac5ebd1b0
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Feb 26 22:59:54 2017 -0500

    Switch to arma::Col<size_t>.
---
 src/mlpack/core/dists/discrete_distribution.hpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/core/dists/discrete_distribution.hpp b/src/mlpack/core/dists/discrete_distribution.hpp
index cbf7c2a..5237651 100644
--- a/src/mlpack/core/dists/discrete_distribution.hpp
+++ b/src/mlpack/core/dists/discrete_distribution.hpp
@@ -72,17 +72,19 @@ class DiscreteDistribution
    * @param numObservations Number of possible observations this distribution
    *    can have.
    */
-  DiscreteDistribution(const arma::vec& numObservations)
+  DiscreteDistribution(const arma::Col<size_t>& numObservations)
   {
-    for (size_t i=0; i<numObservations.n_elem; i++)
+    for (size_t i = 0; i < numObservations.n_elem; i++)
     {
       const size_t numObs = size_t(numObservations[i]);
       if (numObs <= 0)
       {
-        Log::Debug << "The number of observation in each dimension must greater than 0"
-            << "but the given observation number in"<< i <<" dimension is "<< numObs << std::endl;
+        std::ostringstream oss;
+        oss << "number of observations for dimension " << i << " is 0, but "
+            << "must be greater than 0";
+        throw std::invalid_argument(oss.str());
       }
-      probabilities.push_back(arma::ones<arma::vec>(numObs)/numObs);
+      probabilities.push_back(arma::ones<arma::vec>(numObs) / numObs);
     }
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git