[mlpack-svn] r10065 - mlpack/trunk/src/mlpack/methods/naive_bayes
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Oct 28 21:56:38 EDT 2011
Author: rcurtin
Date: 2011-10-28 21:56:37 -0400 (Fri, 28 Oct 2011)
New Revision: 10065
Added:
mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.csv
mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.csv
mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.csv
mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.csv
Removed:
mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.arff
mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.arff
mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.arff
mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.arff
Modified:
mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc
Log:
Use CSVs not ARFFs. Transpose the dataset upon loading.
Modified: mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc 2011-10-29 01:56:24 UTC (rev 10064)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc 2011-10-29 01:56:37 UTC (rev 10065)
@@ -15,8 +15,8 @@
size_t number_of_classes_ = 2;
arma::mat train_data, train_res, calc_mat;
- train_data.load(filename_train_);
- train_res.load(train_result_);
+ train_data.load(filename_train_, arma::auto_detect, true, true);
+ train_res.load(train_result_, arma::auto_detect, true, true);
CLI::GetParam<int>("nbc/classes") = number_of_classes_;
SimpleNaiveBayesClassifier nbc_test_(train_data);
@@ -41,8 +41,8 @@
arma::mat test_data, test_res;
arma::vec test_res_vec, calc_vec;
- test_data.load(filename_test_);
- test_res.load(test_result_);
+ test_data.load(filename_test_, arma::auto_detect, true, true);
+ test_res.load(test_result_, arma::auto_detect, true, true);
nbc_test_.Classify(test_data, calc_vec);
size_t number_of_datum = test_data.n_cols;
Deleted: mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.arff
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.arff 2011-10-29 01:56:24 UTC (rev 10064)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.arff 2011-10-29 01:56:37 UTC (rev 10065)
@@ -1 +0,0 @@
-0,0,0,1,1,1,1
Copied: mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.csv (from rev 10049, mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.arff)
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.csv (rev 0)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/testRes.csv 2011-10-29 01:56:37 UTC (rev 10065)
@@ -0,0 +1 @@
+0,0,0,1,1,1,1
Deleted: mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.arff
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.arff 2011-10-29 01:56:24 UTC (rev 10064)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.arff 2011-10-29 01:56:37 UTC (rev 10065)
@@ -1,17 +0,0 @@
- at relation test
-
-% These should get 100% classification with k < 30
- at attribute a real
- at attribute b real
- at attribute c real
- at attribute d real
- at attribute class {0,1}
-
- at data
-2,4,4,2,0
-2,5,4,2,0
-2,4,4,4,0
-8,4,4,2,1
-8,4,4,2,1
-8,5,4,2,1
-8,4,4,4,1
Copied: mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.csv (from rev 10062, mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.arff)
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.csv (rev 0)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/testSet.csv 2011-10-29 01:56:37 UTC (rev 10065)
@@ -0,0 +1,17 @@
+ at relation test
+
+% These should get 100% classification with k < 30
+ at attribute a real
+ at attribute b real
+ at attribute c real
+ at attribute d real
+ at attribute class {0,1}
+
+ at data
+2,4,4,2,0
+2,5,4,2,0
+2,4,4,4,0
+8,4,4,2,1
+8,4,4,2,1
+8,5,4,2,1
+8,4,4,4,1
Deleted: mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.arff
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.arff 2011-10-29 01:56:24 UTC (rev 10064)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.arff 2011-10-29 01:56:37 UTC (rev 10065)
@@ -1,2 +0,0 @@
-2.75, 4.0000, 3.6875, 2.3750, 0.3333, 0.8000, 0.6292, 0.3833, 0.5161
-8.3333, 4.6667, 3.6667, 2.4, 0.8095, 3.3810, 0.6667, 0.4000, 0.4839
Copied: mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.csv (from rev 10049, mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.arff)
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.csv (rev 0)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/trainRes.csv 2011-10-29 01:56:37 UTC (rev 10065)
@@ -0,0 +1,2 @@
+2.75, 4.0000, 3.6875, 2.3750, 0.3333, 0.8000, 0.6292, 0.3833, 0.5161
+8.3333, 4.6667, 3.6667, 2.4, 0.8095, 3.3810, 0.6667, 0.4000, 0.4839
Deleted: mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.arff
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.arff 2011-10-29 01:56:24 UTC (rev 10064)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.arff 2011-10-29 01:56:37 UTC (rev 10065)
@@ -1,41 +0,0 @@
- at relation test
-
-% These should get 100% classification with k < 30
- at attribute a real
- at attribute b real
- at attribute c real
- at attribute d real
- at attribute class {0,1}
-
- at data
-3,3,3,3,0
-3,4,4,3,0
-3,4,4,3,0
-3,3,4,3,0
-3,6,4,3,0
-2,4,4,3,0
-2,4,4,1,0
-3,3,3,2,0
-3,4,4,2,0
-3,4,4,2,0
-3,3,4,2,0
-3,6,4,2,0
-2,4,4,2,0
-2,4,4,3,0
-2,4,1,2,0
-4,4,4,2,0
-9,3,3,3,1
-9,4,4,3,1
-9,4,4,3,1
-9,3,4,3,1
-9,6,4,3,1
-9,4,4,3,1
-9,4,4,1,1
-9,3,3,2,1
-8,4,4,2,1
-8,4,4,2,1
-8,3,4,2,1
-8,6,4,2,1
-7,8,4,3,1
-6,9,1,2,1
-8,5,4,2,1
Copied: mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.csv (from rev 10049, mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.arff)
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.csv (rev 0)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/trainSet.csv 2011-10-29 01:56:37 UTC (rev 10065)
@@ -0,0 +1,31 @@
+3,3,3,3,0
+3,4,4,3,0
+3,4,4,3,0
+3,3,4,3,0
+3,6,4,3,0
+2,4,4,3,0
+2,4,4,1,0
+3,3,3,2,0
+3,4,4,2,0
+3,4,4,2,0
+3,3,4,2,0
+3,6,4,2,0
+2,4,4,2,0
+2,4,4,3,0
+2,4,1,2,0
+4,4,4,2,0
+9,3,3,3,1
+9,4,4,3,1
+9,4,4,3,1
+9,3,4,3,1
+9,6,4,3,1
+9,4,4,3,1
+9,4,4,1,1
+9,3,3,2,1
+8,4,4,2,1
+8,4,4,2,1
+8,3,4,2,1
+8,6,4,2,1
+7,8,4,3,1
+6,9,1,2,1
+8,5,4,2,1
More information about the mlpack-svn
mailing list