Skip to content

Commit

Permalink
COnfusion matrix improvement
Browse files Browse the repository at this point in the history
 - alignment of model and data classes for enum predictors and integer
   predictors
 - basic test cases
  • Loading branch information
mmalohlava committed Mar 7, 2013
1 parent 96ec88d commit 119dfba
Show file tree
Hide file tree
Showing 14 changed files with 849 additions and 13 deletions.
51 changes: 51 additions & 0 deletions smalldata/test/classifier/iris_test.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
7.7,2.6,6.9,2.3,Iris-virginica
5.8,2.7,4.1,1.0,Iris-versicolor
4.4,3.0,1.3,0.2,Iris-setosa
4.7,3.2,1.6,0.2,Iris-setosa
5.7,3.8,1.7,0.3,Iris-setosa
5.7,2.9,4.2,1.3,Iris-versicolor
5.1,2.5,3.0,1.1,Iris-versicolor
6.8,3.2,5.9,2.3,Iris-virginica
4.3,3.0,1.1,0.1,Iris-setosa
6.4,3.2,4.5,1.5,Iris-versicolor
4.8,3.0,1.4,0.1,Iris-setosa
5.9,3.0,4.2,1.5,Iris-versicolor
4.9,2.5,4.5,1.7,Iris-virginica
5.7,4.4,1.5,0.4,Iris-setosa
5.8,4.0,1.2,0.2,Iris-setosa
5.1,3.3,1.7,0.5,Iris-setosa
5.4,3.9,1.3,0.4,Iris-setosa
6.3,3.3,4.7,1.6,Iris-versicolor
6.7,3.3,5.7,2.1,Iris-virginica
6.7,3.3,5.7,2.5,Iris-virginica
5.0,3.4,1.5,0.2,Iris-setosa
5.2,4.1,1.5,0.1,Iris-setosa
5.4,3.4,1.5,0.4,Iris-setosa
6.2,2.2,4.5,1.5,Iris-versicolor
5.6,2.5,3.9,1.1,Iris-versicolor
5.1,3.8,1.9,0.4,Iris-setosa
6.7,3.1,5.6,2.4,Iris-virginica
6.4,2.9,4.3,1.3,Iris-versicolor
5.7,3.0,4.2,1.2,Iris-versicolor
7.2,3.2,6.0,1.8,Iris-virginica
5.8,2.6,4.0,1.2,Iris-versicolor
5.5,2.4,3.8,1.1,Iris-versicolor
5.7,2.6,3.5,1.0,Iris-versicolor
5.7,2.8,4.1,1.3,Iris-versicolor
4.7,3.2,1.3,0.2,Iris-setosa
6.9,3.1,5.1,2.3,Iris-virginica
4.8,3.1,1.6,0.2,Iris-setosa
4.8,3.4,1.6,0.2,Iris-setosa
5.1,3.5,1.4,0.2,Iris-setosa
5.0,3.3,1.4,0.2,Iris-setosa
4.4,3.2,1.3,0.2,Iris-setosa
6.5,2.8,4.6,1.5,Iris-versicolor
6.5,3.0,5.2,2.0,Iris-virginica
7.4,2.8,6.1,1.9,Iris-virginica
5.5,2.6,4.4,1.2,Iris-versicolor
4.9,3.1,1.5,0.1,Iris-setosa
7.9,3.8,6.4,2.0,Iris-virginica
6.3,2.7,4.9,1.8,Iris-virginica
7.1,3.0,5.9,2.1,Iris-virginica
6.3,2.9,5.6,1.8,Iris-virginica
53 changes: 53 additions & 0 deletions smalldata/test/classifier/iris_test_extra.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
7.7,2.6,6.9,2.3,Iris-virginica
5.8,2.7,4.1,1.0,Iris-versicolor
4.4,3.0,1.3,0.2,Iris-setosa
4.7,3.2,1.6,0.2,Iris-setosa
5.7,3.8,1.7,0.3,Iris-setosa
5.7,2.9,4.2,1.3,Iris-versicolor
5.1,2.5,3.0,1.1,Iris-versicolor
6.8,3.2,5.9,2.3,Iris-virginica
4.3,3.0,1.1,0.1,Iris-setosa
6.4,3.2,4.5,1.5,Iris-versicolor
4.8,3.0,1.4,0.1,Iris-setosa
5.9,3.0,4.2,1.5,Iris-versicolor
4.9,2.5,4.5,1.7,Iris-virginica
5.7,4.4,1.5,0.4,Iris-setosa
5.8,4.0,1.2,0.2,Iris-setosa
5.1,3.3,1.7,0.5,Iris-setosa
5.4,3.9,1.3,0.4,Iris-setosa
6.3,3.3,4.7,1.6,Iris-versicolor
6.7,3.3,5.7,2.1,Iris-virginica
6.7,3.3,5.7,2.5,Iris-virginica
5.0,3.4,1.5,0.2,Iris-setosa
5.2,4.1,1.5,0.1,Iris-setosa
5.4,3.4,1.5,0.4,Iris-setosa
6.2,2.2,4.5,1.5,Iris-versicolor
5.6,2.5,3.9,1.1,Iris-versicolor
5.1,3.8,1.9,0.4,Iris-setosa
6.7,3.1,5.6,2.4,Iris-virginica
6.4,2.9,4.3,1.3,Iris-versicolor
5.7,3.0,4.2,1.2,Iris-versicolor
7.2,3.2,6.0,1.8,Iris-virginica
5.8,2.6,4.0,1.2,Iris-versicolor
5.5,2.4,3.8,1.1,Iris-versicolor
5.7,2.6,3.5,1.0,Iris-versicolor
5.7,2.8,4.1,1.3,Iris-versicolor
4.7,3.2,1.3,0.2,Iris-setosa
6.9,3.1,5.1,2.3,Iris-virginica
4.8,3.1,1.6,0.2,Iris-setosa
4.8,3.4,1.6,0.2,Iris-setosa
5.1,3.5,1.4,0.2,Iris-setosa
5.0,3.3,1.4,0.2,Iris-setosa
4.4,3.2,1.3,0.2,Iris-setosa
6.5,2.8,4.6,1.5,Iris-versicolor
6.5,3.0,5.2,2.0,Iris-virginica
7.4,2.8,6.1,1.9,Iris-virginica
5.5,2.6,4.4,1.2,Iris-versicolor
4.9,3.1,1.5,0.1,Iris-setosa
7.9,3.8,6.4,2.0,Iris-virginica
6.3,2.7,4.9,1.8,Iris-virginica
7.1,3.0,5.9,2.1,Iris-virginica
6.3,2.9,5.6,1.8,Iris-virginica
6.3,2.9,5.6,1.8,Iris-borovicka
5.7,3.0,4.2,1.2,Iris-slivovicka
17 changes: 17 additions & 0 deletions smalldata/test/classifier/iris_test_missing.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
5.8,2.7,4.1,1.0,Iris-versicolor
5.7,2.9,4.2,1.3,Iris-versicolor
5.1,2.5,3.0,1.1,Iris-versicolor
6.4,3.2,4.5,1.5,Iris-versicolor
5.9,3.0,4.2,1.5,Iris-versicolor
6.3,3.3,4.7,1.6,Iris-versicolor
6.2,2.2,4.5,1.5,Iris-versicolor
5.6,2.5,3.9,1.1,Iris-versicolor
6.4,2.9,4.3,1.3,Iris-versicolor
5.7,3.0,4.2,1.2,Iris-versicolor
5.8,2.6,4.0,1.2,Iris-versicolor
5.5,2.4,3.8,1.1,Iris-versicolor
5.7,2.6,3.5,1.0,Iris-versicolor
5.7,2.8,4.1,1.3,Iris-versicolor
6.5,2.8,4.6,1.5,Iris-versicolor
5.5,2.6,4.4,1.2,Iris-versicolor
19 changes: 19 additions & 0 deletions smalldata/test/classifier/iris_test_missing_extra.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
5.8,2.7,4.1,1.0,Iris-versicolor
5.7,2.9,4.2,1.3,Iris-versicolor
5.1,2.5,3.0,1.1,Iris-versicolor
6.4,3.2,4.5,1.5,Iris-versicolor
5.9,3.0,4.2,1.5,Iris-versicolor
6.3,3.3,4.7,1.6,Iris-versicolor
6.2,2.2,4.5,1.5,Iris-versicolor
5.6,2.5,3.9,1.1,Iris-versicolor
6.4,2.9,4.3,1.3,Iris-versicolor
5.7,3.0,4.2,1.2,Iris-versicolor
5.8,2.6,4.0,1.2,Iris-versicolor
5.5,2.4,3.8,1.1,Iris-versicolor
5.7,2.6,3.5,1.0,Iris-versicolor
5.7,2.8,4.1,1.3,Iris-versicolor
6.5,2.8,4.6,1.5,Iris-versicolor
5.5,2.6,4.4,1.2,Iris-versicolor
6.3,2.9,5.6,1.8,Iris-borovicka
5.7,3.0,4.2,1.2,Iris-slivovicka
51 changes: 51 additions & 0 deletions smalldata/test/classifier/iris_test_numeric.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
7.7,2.6,6.9,2.3,2
5.8,2.7,4.1,1.0,1
4.4,3.0,1.3,0.2,0
4.7,3.2,1.6,0.2,0
5.7,3.8,1.7,0.3,0
5.7,2.9,4.2,1.3,1
5.1,2.5,3.0,1.1,1
6.8,3.2,5.9,2.3,2
4.3,3.0,1.1,0.1,0
6.4,3.2,4.5,1.5,1
4.8,3.0,1.4,0.1,0
5.9,3.0,4.2,1.5,1
4.9,2.5,4.5,1.7,2
5.7,4.4,1.5,0.4,0
5.8,4.0,1.2,0.2,0
5.1,3.3,1.7,0.5,0
5.4,3.9,1.3,0.4,0
6.3,3.3,4.7,1.6,1
6.7,3.3,5.7,2.1,2
6.7,3.3,5.7,2.5,2
5.0,3.4,1.5,0.2,0
5.2,4.1,1.5,0.1,0
5.4,3.4,1.5,0.4,0
6.2,2.2,4.5,1.5,1
5.6,2.5,3.9,1.1,1
5.1,3.8,1.9,0.4,0
6.7,3.1,5.6,2.4,2
6.4,2.9,4.3,1.3,1
5.7,3.0,4.2,1.2,1
7.2,3.2,6.0,1.8,2
5.8,2.6,4.0,1.2,1
5.5,2.4,3.8,1.1,1
5.7,2.6,3.5,1.0,1
5.7,2.8,4.1,1.3,1
4.7,3.2,1.3,0.2,0
6.9,3.1,5.1,2.3,2
4.8,3.1,1.6,0.2,0
4.8,3.4,1.6,0.2,0
5.1,3.5,1.4,0.2,0
5.0,3.3,1.4,0.2,0
4.4,3.2,1.3,0.2,0
6.5,2.8,4.6,1.5,1
6.5,3.0,5.2,2.0,2
7.4,2.8,6.1,1.9,2
5.5,2.6,4.4,1.2,1
4.9,3.1,1.5,0.1,0
7.9,3.8,6.4,2.0,2
6.3,2.7,4.9,1.8,2
7.1,3.0,5.9,2.1,2
6.3,2.9,5.6,1.8,2
53 changes: 53 additions & 0 deletions smalldata/test/classifier/iris_test_numeric_extra.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
7.7,2.6,6.9,2.3,2
5.8,2.7,4.1,1.0,1
4.4,3.0,1.3,0.2,0
4.7,3.2,1.6,0.2,0
5.7,3.8,1.7,0.3,0
5.7,2.9,4.2,1.3,1
5.1,2.5,3.0,1.1,1
6.8,3.2,5.9,2.3,2
4.3,3.0,1.1,0.1,0
6.4,3.2,4.5,1.5,1
4.8,3.0,1.4,0.1,0
5.9,3.0,4.2,1.5,1
4.9,2.5,4.5,1.7,2
5.7,4.4,1.5,0.4,0
5.8,4.0,1.2,0.2,0
5.1,3.3,1.7,0.5,0
5.4,3.9,1.3,0.4,0
6.3,3.3,4.7,1.6,1
6.7,3.3,5.7,2.1,2
6.7,3.3,5.7,2.5,2
5.0,3.4,1.5,0.2,0
5.2,4.1,1.5,0.1,0
5.4,3.4,1.5,0.4,0
6.2,2.2,4.5,1.5,1
5.6,2.5,3.9,1.1,1
5.1,3.8,1.9,0.4,0
6.7,3.1,5.6,2.4,2
6.4,2.9,4.3,1.3,1
5.7,3.0,4.2,1.2,1
7.2,3.2,6.0,1.8,2
5.8,2.6,4.0,1.2,1
5.5,2.4,3.8,1.1,1
5.7,2.6,3.5,1.0,1
5.7,2.8,4.1,1.3,1
4.7,3.2,1.3,0.2,0
6.9,3.1,5.1,2.3,2
4.8,3.1,1.6,0.2,0
4.8,3.4,1.6,0.2,0
5.1,3.5,1.4,0.2,0
5.0,3.3,1.4,0.2,0
4.4,3.2,1.3,0.2,0
6.5,2.8,4.6,1.5,1
6.5,3.0,5.2,2.0,2
7.4,2.8,6.1,1.9,2
5.5,2.6,4.4,1.2,1
4.9,3.1,1.5,0.1,0
7.9,3.8,6.4,2.0,2
6.3,2.7,4.9,1.8,2
7.1,3.0,5.9,2.1,2
6.3,2.9,5.6,1.8,2
6.3,2.9,5.6,1.8,3
5.7,3.0,4.2,1.2,4
53 changes: 53 additions & 0 deletions smalldata/test/classifier/iris_test_numeric_extra2.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
7.7,2.6,6.9,2.3,2
5.8,2.7,4.1,1.0,1
4.4,3.0,1.3,0.2,0
4.7,3.2,1.6,0.2,0
5.7,3.8,1.7,0.3,0
5.7,2.9,4.2,1.3,1
5.1,2.5,3.0,1.1,1
6.8,3.2,5.9,2.3,2
4.3,3.0,1.1,0.1,0
6.4,3.2,4.5,1.5,1
4.8,3.0,1.4,0.1,0
5.9,3.0,4.2,1.5,1
4.9,2.5,4.5,1.7,2
5.7,4.4,1.5,0.4,0
5.8,4.0,1.2,0.2,0
5.1,3.3,1.7,0.5,0
5.4,3.9,1.3,0.4,0
6.3,3.3,4.7,1.6,1
6.7,3.3,5.7,2.1,2
6.7,3.3,5.7,2.5,2
5.0,3.4,1.5,0.2,0
5.2,4.1,1.5,0.1,0
5.4,3.4,1.5,0.4,0
6.2,2.2,4.5,1.5,1
5.6,2.5,3.9,1.1,1
5.1,3.8,1.9,0.4,0
6.7,3.1,5.6,2.4,2
6.4,2.9,4.3,1.3,1
5.7,3.0,4.2,1.2,1
7.2,3.2,6.0,1.8,2
5.8,2.6,4.0,1.2,1
5.5,2.4,3.8,1.1,1
5.7,2.6,3.5,1.0,1
5.7,2.8,4.1,1.3,1
4.7,3.2,1.3,0.2,0
6.9,3.1,5.1,2.3,2
4.8,3.1,1.6,0.2,0
4.8,3.4,1.6,0.2,0
5.1,3.5,1.4,0.2,0
5.0,3.3,1.4,0.2,0
4.4,3.2,1.3,0.2,0
6.5,2.8,4.6,1.5,1
6.5,3.0,5.2,2.0,2
7.4,2.8,6.1,1.9,2
5.5,2.6,4.4,1.2,1
4.9,3.1,1.5,0.1,0
7.9,3.8,6.4,2.0,2
6.3,2.7,4.9,1.8,2
7.1,3.0,5.9,2.1,2
6.3,2.9,5.6,1.8,2
6.3,2.9,5.6,1.8,-1
5.7,3.0,4.2,1.2,4
17 changes: 17 additions & 0 deletions smalldata/test/classifier/iris_test_numeric_missing.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
5.8,2.7,4.1,1.0,1
5.7,2.9,4.2,1.3,1
5.1,2.5,3.0,1.1,1
6.4,3.2,4.5,1.5,1
5.9,3.0,4.2,1.5,1
6.3,3.3,4.7,1.6,1
6.2,2.2,4.5,1.5,1
5.6,2.5,3.9,1.1,1
6.4,2.9,4.3,1.3,1
5.7,3.0,4.2,1.2,1
5.8,2.6,4.0,1.2,1
5.5,2.4,3.8,1.1,1
5.7,2.6,3.5,1.0,1
5.7,2.8,4.1,1.3,1
6.5,2.8,4.6,1.5,1
5.5,2.6,4.4,1.2,1
19 changes: 19 additions & 0 deletions smalldata/test/classifier/iris_test_numeric_missing_extra.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
sepal_len,sepal_wid,petal_len,petal_wid,species
5.8,2.7,4.1,1.0,1
5.7,2.9,4.2,1.3,1
5.1,2.5,3.0,1.1,1
6.4,3.2,4.5,1.5,1
5.9,3.0,4.2,1.5,1
6.3,3.3,4.7,1.6,1
6.2,2.2,4.5,1.5,1
5.6,2.5,3.9,1.1,1
6.4,2.9,4.3,1.3,1
5.7,3.0,4.2,1.2,1
5.8,2.6,4.0,1.2,1
5.5,2.4,3.8,1.1,1
5.7,2.6,3.5,1.0,1
5.7,2.8,4.1,1.3,1
6.5,2.8,4.6,1.5,1
5.5,2.6,4.4,1.2,1
6.3,2.9,5.6,1.8,3
5.7,3.0,4.2,1.2,4
Loading

0 comments on commit 119dfba

Please sign in to comment.