[mlpack-git] master: Use .csv extensions not .txt extensions. (734a0b1)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Dec 23 12:23:10 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/114d43256f960904d695f7644fdda64336324e0d...734a0b154c3835563709cc0d5e30602b58674e52

>---------------------------------------------------------------

commit 734a0b154c3835563709cc0d5e30602b58674e52
Author: ryan <ryan at ratml.org>
Date:   Wed Dec 23 12:22:48 2015 -0500

    Use .csv extensions not .txt extensions.
    
    (This problem was the result of a failed merge.)


>---------------------------------------------------------------

734a0b154c3835563709cc0d5e30602b58674e52
 src/mlpack/tests/adaboost_test.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/mlpack/tests/adaboost_test.cpp b/src/mlpack/tests/adaboost_test.cpp
index adf7ee1..5d31029 100644
--- a/src/mlpack/tests/adaboost_test.cpp
+++ b/src/mlpack/tests/adaboost_test.cpp
@@ -28,8 +28,8 @@ BOOST_AUTO_TEST_CASE(HammingLossBoundIris)
 {
   arma::mat inputData;
 
-  if (!data::Load("iris.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset iris.txt!");
+  if (!data::Load("iris.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset iris.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("iris_labels.txt", labels))
@@ -116,8 +116,8 @@ BOOST_AUTO_TEST_CASE(WeakLearnerErrorIris)
 BOOST_AUTO_TEST_CASE(HammingLossBoundVertebralColumn)
 {
   arma::mat inputData;
-  if (!data::Load("vc2.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset vc2.txt!");
+  if (!data::Load("vc2.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset vc2.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("vc2_labels.txt",labels))
@@ -154,8 +154,8 @@ BOOST_AUTO_TEST_CASE(HammingLossBoundVertebralColumn)
 BOOST_AUTO_TEST_CASE(WeakLearnerErrorVertebralColumn)
 {
   arma::mat inputData;
-  if (!data::Load("vc2.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset vc2.txt!");
+  if (!data::Load("vc2.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset vc2.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("vc2_labels.txt",labels))
@@ -286,8 +286,8 @@ BOOST_AUTO_TEST_CASE(WeakLearnerErrorNonLinearSepData)
 BOOST_AUTO_TEST_CASE(HammingLossIris_DS)
 {
   arma::mat inputData;
-  if (!data::Load("iris.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset iris.txt!");
+  if (!data::Load("iris.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset iris.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("iris_labels.txt",labels))
@@ -325,8 +325,8 @@ BOOST_AUTO_TEST_CASE(HammingLossIris_DS)
 BOOST_AUTO_TEST_CASE(WeakLearnerErrorIris_DS)
 {
   arma::mat inputData;
-  if (!data::Load("iris.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset iris.txt!");
+  if (!data::Load("iris.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset iris.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("iris_labels.txt", labels))
@@ -377,8 +377,8 @@ BOOST_AUTO_TEST_CASE(WeakLearnerErrorIris_DS)
 BOOST_AUTO_TEST_CASE(HammingLossBoundVertebralColumn_DS)
 {
   arma::mat inputData;
-  if (!data::Load("vc2.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset vc2.txt!");
+  if (!data::Load("vc2.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset vc2.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("vc2_labels.txt",labels))
@@ -418,8 +418,8 @@ BOOST_AUTO_TEST_CASE(HammingLossBoundVertebralColumn_DS)
 BOOST_AUTO_TEST_CASE(WeakLearnerErrorVertebralColumn_DS)
 {
   arma::mat inputData;
-  if (!data::Load("vc2.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset vc2.txt!");
+  if (!data::Load("vc2.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset vc2.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("vc2_labels.txt", labels))
@@ -555,8 +555,8 @@ BOOST_AUTO_TEST_CASE(ClassifyTest_VERTEBRALCOL)
 {
   mlpack::math::RandomSeed(std::time(NULL));
   arma::mat inputData;
-  if (!data::Load("vc2.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset vc2.txt!");
+  if (!data::Load("vc2.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset vc2.csv!");
 
   arma::Mat<size_t> labels;
   if (!data::Load("vc2_labels.txt",labels))
@@ -722,8 +722,8 @@ BOOST_AUTO_TEST_CASE(TrainTest)
   AdaBoost<> a(inputData, labels.row(0), p, iterations, tolerance);
 
   // Now load another dataset...
-  if (!data::Load("vc2.txt", inputData))
-    BOOST_FAIL("Cannot load test dataset vc2.txt!");
+  if (!data::Load("vc2.csv", inputData))
+    BOOST_FAIL("Cannot load test dataset vc2.csv!");
   if (!data::Load("vc2_labels.txt", labels))
     BOOST_FAIL("Cannot load labels for vc2_labels.txt");
 



More information about the mlpack-git mailing list