[mlpack-svn] r15396 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Jul 3 13:51:31 EDT 2013
Author: rcurtin
Date: Wed Jul 3 13:51:31 2013
New Revision: 15396
Log:
Uncomment checks that weren't failing in the NBC test and update for newer
NaiveBayesClassifier API. Also, normalize labels before running NBC.
Modified:
mlpack/trunk/src/mlpack/tests/nbc_test.cpp
Modified: mlpack/trunk/src/mlpack/tests/nbc_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/nbc_test.cpp (original)
+++ mlpack/trunk/src/mlpack/tests/nbc_test.cpp Wed Jul 3 13:51:31 2013
@@ -26,7 +26,13 @@
data::Load(trainFilename, trainData, true);
data::Load(trainResultFilename, trainRes, true);
- NaiveBayesClassifier<> nbcTest(trainData, classes);
+ // Get the labels out.
+ arma::Col<size_t> labels(trainData.n_cols);
+ for (size_t i = 0; i < trainData.n_cols; ++i)
+ labels[i] = trainData(trainData.n_rows - 1, i);
+ trainData.shed_row(trainData.n_rows - 1);
+
+ NaiveBayesClassifier<> nbcTest(trainData, labels, classes);
size_t dimension = nbcTest.Means().n_rows;
calcMat.zeros(2 * dimension + 1, classes);
@@ -43,9 +49,9 @@
for (size_t i = 0; i < classes; i++)
calcMat(2 * dimension, i) = nbcTest.Probabilities()(i);
-// for(size_t i = 0; i < calcMat.n_rows; i++)
-// for(size_t j = 0; j < classes; j++)
-// BOOST_REQUIRE_CLOSE(trainRes(i, j) + .00001, calcMat(i, j), 0.01);
+ for (size_t i = 0; i < calcMat.n_rows; i++)
+ for (size_t j = 0; j < classes; j++)
+ BOOST_REQUIRE_CLOSE(trainRes(i, j) + .00001, calcMat(i, j), 0.01);
arma::mat testData;
arma::Mat<size_t> testRes;
@@ -57,8 +63,8 @@
nbcTest.Classify(testData, calcVec);
-// for(size_t i = 0; i < testData.n_cols; i++)
-// BOOST_REQUIRE_EQUAL(testRes(i), calcVec(i));
+ for (size_t i = 0; i < testData.n_cols; i++)
+ BOOST_REQUIRE_EQUAL(testRes(i), calcVec(i));
}
BOOST_AUTO_TEST_SUITE_END();
More information about the mlpack-svn
mailing list