[mlpack-svn] r10853 - mlpack/trunk/src/mlpack/tests

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

Author: rcurtin
Date: 2011-12-16 09:33:20 -0500 (Fri, 16 Dec 2011)
New Revision: 10853

Modified:
   mlpack/trunk/src/mlpack/tests/distribution_test.cpp
   mlpack/trunk/src/mlpack/tests/hmm_test.cpp
Log:
Update to new direct-access DiscreteDistribution::Probabilities() API.


Modified: mlpack/trunk/src/mlpack/tests/distribution_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/distribution_test.cpp	2011-12-16 14:32:43 UTC (rev 10852)
+++ mlpack/trunk/src/mlpack/tests/distribution_test.cpp	2011-12-16 14:33:20 UTC (rev 10853)
@@ -37,7 +37,7 @@
 {
   DiscreteDistribution d(5);
 
-  d.Probabilities("0.2 0.4 0.1 0.1 0.2");
+  d.Probabilities() = "0.2 0.4 0.1 0.1 0.2";
 
   BOOST_REQUIRE_CLOSE(d.Probability("0"), 0.2, 1e-5);
   BOOST_REQUIRE_CLOSE(d.Probability("1"), 0.4, 1e-5);
@@ -53,7 +53,7 @@
 {
   DiscreteDistribution d(3);
 
-  d.Probabilities("0.3 0.6 0.1");
+  d.Probabilities() = "0.3 0.6 0.1";
 
   arma::vec actualProb(3);
 

Modified: mlpack/trunk/src/mlpack/tests/hmm_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/hmm_test.cpp	2011-12-16 14:32:43 UTC (rev 10852)
+++ mlpack/trunk/src/mlpack/tests/hmm_test.cpp	2011-12-16 14:33:20 UTC (rev 10853)
@@ -170,7 +170,7 @@
 {
   HMM<DiscreteDistribution> hmm(1, 2); // 1 state, 2 emissions.
   // Randomize the emission matrix.
-  hmm.Emission()[0].Probabilities(arma::randu<arma::vec>(2));
+  hmm.Emission()[0].Probabilities() = arma::randu<arma::vec>(2);
 
   // P(each emission) = 0.5.
   // I've been careful to make P(first emission = 0) = P(first emission = 1).
@@ -205,8 +205,8 @@
 
   // A little bit of obfuscation to the solution.
   hmm.Transition() = arma::mat("0.1 0.4; 0.9 0.6");
-  hmm.Emission()[0].Probabilities("0.85 0.15 0.00 0.00");
-  hmm.Emission()[1].Probabilities("0.00 0.00 0.50 0.50");
+  hmm.Emission()[0].Probabilities() = "0.85 0.15 0.00 0.00";
+  hmm.Emission()[1].Probabilities() = "0.00 0.00 0.50 0.50";
 
   // True emission matrix:
   //  [[0.4 0  ]
@@ -290,9 +290,9 @@
   std::vector<DiscreteDistribution> emission(3);
 
   transition.randu(3, 3);
-  emission[0].Probabilities(arma::randu<arma::vec>(6));
-  emission[1].Probabilities(arma::randu<arma::vec>(6));
-  emission[2].Probabilities(arma::randu<arma::vec>(6));
+  emission[0].Probabilities() = arma::randu<arma::vec>(6);
+  emission[1].Probabilities() = arma::randu<arma::vec>(6);
+  emission[2].Probabilities() = arma::randu<arma::vec>(6);
 
   // Normalize so they we have a correct transition matrix.
   for (size_t col = 0; col < 3; col++)
@@ -414,10 +414,10 @@
   // 6 emissions, 4 states.  Random transition and emission probability.
   arma::mat transition(4, 4);
   std::vector<DiscreteDistribution> emission(4);
-  emission[0].Probabilities(arma::randu<arma::vec>(6));
-  emission[1].Probabilities(arma::randu<arma::vec>(6));
-  emission[2].Probabilities(arma::randu<arma::vec>(6));
-  emission[3].Probabilities(arma::randu<arma::vec>(6));
+  emission[0].Probabilities() = arma::randu<arma::vec>(6);
+  emission[1].Probabilities() = arma::randu<arma::vec>(6);
+  emission[2].Probabilities() = arma::randu<arma::vec>(6);
+  emission[3].Probabilities() = arma::randu<arma::vec>(6);
 
   transition.randu();
 
@@ -470,9 +470,9 @@
                        "0.2 0.6 0.2;"
                        "0.3 0.4 0.7");
   std::vector<DiscreteDistribution> emission(3);
-  emission[0].Probabilities("0.75 0.25 0.00 0.00");
-  emission[1].Probabilities("0.00 0.25 0.25 0.50");
-  emission[2].Probabilities("0.10 0.40 0.40 0.10");
+  emission[0].Probabilities() = "0.75 0.25 0.00 0.00";
+  emission[1].Probabilities() = "0.00 0.25 0.25 0.50";
+  emission[2].Probabilities() = "0.10 0.40 0.40 0.10";
 
   HMM<DiscreteDistribution> hmm(transition, emission);