Skip to content

Commit 4138b63

Browse files
max-accmax-acc
authored
Merge pull request #8 from max-acc/5-confusion-matrix
confusion matrix
2 parents b5cdd1f + 13dc9af commit 4138b63

File tree

7 files changed

+378
-23
lines changed

7 files changed

+378
-23
lines changed

‎Iris_unordered_2.csv‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
Id,SepalLengthCm,SepalWidthCm,PetalLengthCm,PetalWidthCm,Species
2+
61,5.0,2.0,3.5,1.0,Iris-versicolor
3+
63,6.0,2.2,4.0,1.0,Iris-versicolor
4+
120,6.0,2.2,5.0,1.5,Iris-virginica
5+
69,6.2,2.2,4.5,1.5,Iris-versicolor
6+
42,4.5,2.3,1.3,0.3,Iris-setosa
7+
94,5.0,2.3,3.3,1.0,Iris-versicolor
8+
54,5.5,2.3,4.0,1.3,Iris-versicolor
9+
88,6.3,2.3,4.4,1.3,Iris-versicolor
10+
58,4.9,2.4,3.3,1.0,Iris-versicolor
11+
82,5.5,2.4,3.7,1.0,Iris-versicolor
12+
81,5.5,2.4,3.8,1.1,Iris-versicolor
13+
99,5.1,2.5,3.0,1.1,Iris-versicolor
14+
70,5.6,2.5,3.9,1.1,Iris-versicolor
15+
90,5.5,2.5,4.0,1.3,Iris-versicolor
16+
73,6.3,2.5,4.9,1.5,Iris-versicolor
17+
107,4.9,2.5,4.5,1.7,Iris-virginica
18+
109,6.7,2.5,5.8,1.8,Iris-virginica
19+
147,6.3,2.5,5.0,1.9,Iris-virginica
20+
114,5.7,2.5,5.0,2.0,Iris-virginica
21+
80,5.7,2.6,3.5,1.0,Iris-versicolor
22+
91,5.5,2.6,4.4,1.2,Iris-versicolor
23+
93,5.8,2.6,4.0,1.2,Iris-versicolor
24+
135,6.1,2.6,5.6,1.4,Iris-virginica
25+
119,7.7,2.6,6.9,2.3,Iris-virginica
26+
68,5.8,2.7,4.1,1.0,Iris-versicolor
27+
83,5.8,2.7,3.9,1.2,Iris-versicolor
28+
95,5.6,2.7,4.2,1.3,Iris-versicolor
29+
60,5.2,2.7,3.9,1.4,Iris-versicolor
30+
84,6.0,2.7,5.1,1.6,Iris-versicolor
31+
124,6.3,2.7,4.9,1.8,Iris-virginica
32+
102,5.8,2.7,5.1,1.9,Iris-virginica
33+
143,5.8,2.7,5.1,1.9,Iris-virginica
34+
112,6.4,2.7,5.3,1.9,Iris-virginica
35+
74,6.1,2.8,4.7,1.2,Iris-versicolor
36+
56,5.7,2.8,4.5,1.3,Iris-versicolor
37+
100,5.7,2.8,4.1,1.3,Iris-versicolor
38+
72,6.1,2.8,4.0,1.3,Iris-versicolor
39+
77,6.8,2.8,4.8,1.4,Iris-versicolor
40+
134,6.3,2.8,5.1,1.5,Iris-virginica
41+
55,6.5,2.8,4.6,1.5,Iris-versicolor
42+
127,6.2,2.8,4.8,1.8,Iris-virginica
43+
131,7.4,2.8,6.1,1.9,Iris-virginica
44+
122,5.6,2.8,4.9,2.0,Iris-virginica
45+
123,7.7,2.8,6.7,2.0,Iris-virginica
46+
129,6.4,2.8,5.6,2.1,Iris-virginica
47+
133,6.4,2.8,5.6,2.2,Iris-virginica
48+
115,5.8,2.8,5.1,2.4,Iris-virginica
49+
9,4.4,2.9,1.4,0.2,Iris-setosa
50+
65,5.6,2.9,3.6,1.3,Iris-versicolor
51+
97,5.7,2.9,4.2,1.3,Iris-versicolor
52+
98,6.2,2.9,4.3,1.3,Iris-versicolor
53+
75,6.4,2.9,4.3,1.3,Iris-versicolor
54+
59,6.6,2.9,4.6,1.3,Iris-versicolor
55+
64,6.1,2.9,4.7,1.4,Iris-versicolor
56+
79,6.0,2.9,4.5,1.5,Iris-versicolor
57+
104,6.3,2.9,5.6,1.8,Iris-virginica
58+
108,7.3,2.9,6.3,1.8,Iris-virginica
59+
14,4.3,3.0,1.1,0.1,Iris-setosa
60+
13,4.8,3.0,1.4,0.1,Iris-setosa
61+
39,4.4,3.0,1.3,0.2,Iris-setosa
62+
2,4.9,3.0,1.4,0.2,Iris-setosa
63+
26,5.0,3.0,1.6,0.2,Iris-setosa
64+
46,4.8,3.0,1.4,0.3,Iris-setosa
65+
96,5.7,3.0,4.2,1.2,Iris-versicolor
66+
89,5.6,3.0,4.1,1.3,Iris-versicolor
67+
92,6.1,3.0,4.6,1.4,Iris-versicolor
68+
76,6.6,3.0,4.4,1.4,Iris-versicolor
69+
85,5.4,3.0,4.5,1.5,Iris-versicolor
70+
67,5.6,3.0,4.5,1.5,Iris-versicolor
71+
62,5.9,3.0,4.2,1.5,Iris-versicolor
72+
130,7.2,3.0,5.8,1.6,Iris-virginica
73+
78,6.7,3.0,5.0,1.7,Iris-versicolor
74+
150,5.9,3.0,5.1,1.8,Iris-virginica
75+
139,6.0,3.0,4.8,1.8,Iris-virginica
76+
128,6.1,3.0,4.9,1.8,Iris-virginica
77+
117,6.5,3.0,5.5,1.8,Iris-virginica
78+
148,6.5,3.0,5.2,2.0,Iris-virginica
79+
113,6.8,3.0,5.5,2.1,Iris-virginica
80+
103,7.1,3.0,5.9,2.1,Iris-virginica
81+
106,7.6,3.0,6.6,2.1,Iris-virginica
82+
105,6.5,3.0,5.8,2.2,Iris-virginica
83+
146,6.7,3.0,5.2,2.3,Iris-virginica
84+
136,7.7,3.0,6.1,2.3,Iris-virginica
85+
10,4.9,3.1,1.5,0.1,Iris-setosa
86+
35,4.9,3.1,1.5,0.1,Iris-setosa
87+
38,4.9,3.1,1.5,0.1,Iris-setosa
88+
4,4.6,3.1,1.5,0.2,Iris-setosa
89+
31,4.8,3.1,1.6,0.2,Iris-setosa
90+
66,6.7,3.1,4.4,1.4,Iris-versicolor
91+
87,6.7,3.1,4.7,1.5,Iris-versicolor
92+
53,6.9,3.1,4.9,1.5,Iris-versicolor
93+
138,6.4,3.1,5.5,1.8,Iris-virginica
94+
140,6.9,3.1,5.4,2.1,Iris-virginica
95+
142,6.9,3.1,5.1,2.3,Iris-virginica
96+
141,6.7,3.1,5.6,2.4,Iris-virginica
97+
43,4.4,3.2,1.3,0.2,Iris-setosa
98+
48,4.6,3.2,1.4,0.2,Iris-setosa
99+
3,4.7,3.2,1.3,0.2,Iris-setosa
100+
30,4.7,3.2,1.6,0.2,Iris-setosa
101+
36,5.0,3.2,1.2,0.2,Iris-setosa
102+
51,7.0,3.2,4.7,1.4,Iris-versicolor
103+
52,6.4,3.2,4.5,1.5,Iris-versicolor
104+
71,5.9,3.2,4.8,1.8,Iris-versicolor
105+
126,7.2,3.2,6.0,1.8,Iris-virginica
106+
111,6.5,3.2,5.1,2.0,Iris-virginica
107+
116,6.4,3.2,5.3,2.3,Iris-virginica
108+
144,6.8,3.2,5.9,2.3,Iris-virginica
109+
121,6.9,3.2,5.7,2.3,Iris-virginica
110+
50,5.0,3.3,1.4,0.2,Iris-setosa
111+
24,5.1,3.3,1.7,0.5,Iris-setosa
112+
57,6.3,3.3,4.7,1.6,Iris-versicolor
113+
125,6.7,3.3,5.7,2.1,Iris-virginica
114+
101,6.3,3.3,6.0,2.5,Iris-virginica
115+
145,6.7,3.3,5.7,2.5,Iris-virginica
116+
12,4.8,3.4,1.6,0.2,Iris-setosa
117+
25,4.8,3.4,1.9,0.2,Iris-setosa
118+
8,5.0,3.4,1.5,0.2,Iris-setosa
119+
40,5.1,3.4,1.5,0.2,Iris-setosa
120+
29,5.2,3.4,1.4,0.2,Iris-setosa
121+
21,5.4,3.4,1.7,0.2,Iris-setosa
122+
7,4.6,3.4,1.4,0.3,Iris-setosa
123+
27,5.0,3.4,1.6,0.4,Iris-setosa
124+
32,5.4,3.4,1.5,0.4,Iris-setosa
125+
86,6.0,3.4,4.5,1.6,Iris-versicolor
126+
149,6.2,3.4,5.4,2.3,Iris-virginica
127+
137,6.3,3.4,5.6,2.4,Iris-virginica
128+
1,5.1,3.5,1.4,0.2,Iris-setosa
129+
28,5.2,3.5,1.5,0.2,Iris-setosa
130+
37,5.5,3.5,1.3,0.2,Iris-setosa
131+
41,5.0,3.5,1.3,0.3,Iris-setosa
132+
18,5.1,3.5,1.4,0.3,Iris-setosa
133+
44,5.0,3.5,1.6,0.6,Iris-setosa
134+
23,4.6,3.6,1.0,0.2,Iris-setosa
135+
5,5.0,3.6,1.4,0.2,Iris-setosa
136+
110,7.2,3.6,6.1,2.5,Iris-virginica
137+
49,5.3,3.7,1.5,0.2,Iris-setosa
138+
11,5.4,3.7,1.5,0.2,Iris-setosa
139+
22,5.1,3.7,1.5,0.4,Iris-setosa
140+
47,5.1,3.8,1.6,0.2,Iris-setosa
141+
20,5.1,3.8,1.5,0.3,Iris-setosa
142+
19,5.7,3.8,1.7,0.3,Iris-setosa
143+
45,5.1,3.8,1.9,0.4,Iris-setosa
144+
132,7.9,3.8,6.4,2.0,Iris-virginica
145+
118,7.7,3.8,6.7,2.2,Iris-virginica
146+
6,5.4,3.9,1.7,0.4,Iris-setosa
147+
17,5.4,3.9,1.3,0.4,Iris-setosa
148+
15,5.8,4.0,1.2,0.2,Iris-setosa
149+
33,5.2,4.1,1.5,0.1,Iris-setosa
150+
34,5.5,4.2,1.4,0.2,Iris-setosa
151+
16,5.7,4.4,1.5,0.4,Iris-versicolor

‎src/Iris_ordered - Copy.csv‎ renamed to ‎src/Iris_ordered.csv‎

File renamed without changes.

‎src/Iris_unordered_2.csv‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
Id,SepalLengthCm,SepalWidthCm,PetalLengthCm,PetalWidthCm,Species
2+
61,5.0,2.0,3.5,1.0,Iris-versicolor
3+
63,6.0,2.2,4.0,1.0,Iris-versicolor
4+
120,6.0,2.2,5.0,1.5,Iris-virginica
5+
69,6.2,2.2,4.5,1.5,Iris-versicolor
6+
42,4.5,2.3,1.3,0.3,Iris-setosa
7+
94,5.0,2.3,3.3,1.0,Iris-versicolor
8+
54,5.5,2.3,4.0,1.3,Iris-versicolor
9+
88,6.3,2.3,4.4,1.3,Iris-versicolor
10+
58,4.9,2.4,3.3,1.0,Iris-versicolor
11+
82,5.5,2.4,3.7,1.0,Iris-versicolor
12+
81,5.5,2.4,3.8,1.1,Iris-versicolor
13+
99,5.1,2.5,3.0,1.1,Iris-versicolor
14+
70,5.6,2.5,3.9,1.1,Iris-versicolor
15+
90,5.5,2.5,4.0,1.3,Iris-versicolor
16+
73,6.3,2.5,4.9,1.5,Iris-versicolor
17+
107,4.9,2.5,4.5,1.7,Iris-virginica
18+
109,6.7,2.5,5.8,1.8,Iris-virginica
19+
147,6.3,2.5,5.0,1.9,Iris-virginica
20+
114,5.7,2.5,5.0,2.0,Iris-virginica
21+
80,5.7,2.6,3.5,1.0,Iris-versicolor
22+
91,5.5,2.6,4.4,1.2,Iris-versicolor
23+
93,5.8,2.6,4.0,1.2,Iris-versicolor
24+
135,6.1,2.6,5.6,1.4,Iris-virginica
25+
119,7.7,2.6,6.9,2.3,Iris-virginica
26+
68,5.8,2.7,4.1,1.0,Iris-versicolor
27+
83,5.8,2.7,3.9,1.2,Iris-versicolor
28+
95,5.6,2.7,4.2,1.3,Iris-versicolor
29+
60,5.2,2.7,3.9,1.4,Iris-versicolor
30+
84,6.0,2.7,5.1,1.6,Iris-versicolor
31+
124,6.3,2.7,4.9,1.8,Iris-virginica
32+
102,5.8,2.7,5.1,1.9,Iris-virginica
33+
143,5.8,2.7,5.1,1.9,Iris-virginica
34+
112,6.4,2.7,5.3,1.9,Iris-virginica
35+
74,6.1,2.8,4.7,1.2,Iris-versicolor
36+
56,5.7,2.8,4.5,1.3,Iris-versicolor
37+
100,5.7,2.8,4.1,1.3,Iris-versicolor
38+
72,6.1,2.8,4.0,1.3,Iris-versicolor
39+
77,6.8,2.8,4.8,1.4,Iris-versicolor
40+
134,6.3,2.8,5.1,1.5,Iris-virginica
41+
55,6.5,2.8,4.6,1.5,Iris-versicolor
42+
127,6.2,2.8,4.8,1.8,Iris-virginica
43+
131,7.4,2.8,6.1,1.9,Iris-virginica
44+
122,5.6,2.8,4.9,2.0,Iris-virginica
45+
123,7.7,2.8,6.7,2.0,Iris-virginica
46+
129,6.4,2.8,5.6,2.1,Iris-virginica
47+
133,6.4,2.8,5.6,2.2,Iris-virginica
48+
115,5.8,2.8,5.1,2.4,Iris-virginica
49+
9,4.4,2.9,1.4,0.2,Iris-setosa
50+
65,5.6,2.9,3.6,1.3,Iris-versicolor
51+
97,5.7,2.9,4.2,1.3,Iris-versicolor
52+
98,6.2,2.9,4.3,1.3,Iris-versicolor
53+
75,6.4,2.9,4.3,1.3,Iris-versicolor
54+
59,6.6,2.9,4.6,1.3,Iris-versicolor
55+
64,6.1,2.9,4.7,1.4,Iris-versicolor
56+
79,6.0,2.9,4.5,1.5,Iris-versicolor
57+
104,6.3,2.9,5.6,1.8,Iris-virginica
58+
108,7.3,2.9,6.3,1.8,Iris-virginica
59+
14,4.3,3.0,1.1,0.1,Iris-setosa
60+
13,4.8,3.0,1.4,0.1,Iris-setosa
61+
39,4.4,3.0,1.3,0.2,Iris-setosa
62+
2,4.9,3.0,1.4,0.2,Iris-setosa
63+
26,5.0,3.0,1.6,0.2,Iris-setosa
64+
46,4.8,3.0,1.4,0.3,Iris-setosa
65+
96,5.7,3.0,4.2,1.2,Iris-versicolor
66+
89,5.6,3.0,4.1,1.3,Iris-versicolor
67+
92,6.1,3.0,4.6,1.4,Iris-versicolor
68+
76,6.6,3.0,4.4,1.4,Iris-versicolor
69+
85,5.4,3.0,4.5,1.5,Iris-versicolor
70+
67,5.6,3.0,4.5,1.5,Iris-versicolor
71+
62,5.9,3.0,4.2,1.5,Iris-versicolor
72+
130,7.2,3.0,5.8,1.6,Iris-virginica
73+
78,6.7,3.0,5.0,1.7,Iris-versicolor
74+
150,5.9,3.0,5.1,1.8,Iris-virginica
75+
139,6.0,3.0,4.8,1.8,Iris-virginica
76+
128,6.1,3.0,4.9,1.8,Iris-virginica
77+
117,6.5,3.0,5.5,1.8,Iris-virginica
78+
148,6.5,3.0,5.2,2.0,Iris-virginica
79+
113,6.8,3.0,5.5,2.1,Iris-virginica
80+
103,7.1,3.0,5.9,2.1,Iris-virginica
81+
106,7.6,3.0,6.6,2.1,Iris-virginica
82+
105,6.5,3.0,5.8,2.2,Iris-virginica
83+
146,6.7,3.0,5.2,2.3,Iris-virginica
84+
136,7.7,3.0,6.1,2.3,Iris-virginica
85+
10,4.9,3.1,1.5,0.1,Iris-setosa
86+
35,4.9,3.1,1.5,0.1,Iris-setosa
87+
38,4.9,3.1,1.5,0.1,Iris-setosa
88+
4,4.6,3.1,1.5,0.2,Iris-setosa
89+
31,4.8,3.1,1.6,0.2,Iris-setosa
90+
66,6.7,3.1,4.4,1.4,Iris-versicolor
91+
87,6.7,3.1,4.7,1.5,Iris-versicolor
92+
53,6.9,3.1,4.9,1.5,Iris-versicolor
93+
138,6.4,3.1,5.5,1.8,Iris-virginica
94+
140,6.9,3.1,5.4,2.1,Iris-virginica
95+
142,6.9,3.1,5.1,2.3,Iris-virginica
96+
141,6.7,3.1,5.6,2.4,Iris-virginica
97+
43,4.4,3.2,1.3,0.2,Iris-setosa
98+
48,4.6,3.2,1.4,0.2,Iris-setosa
99+
3,4.7,3.2,1.3,0.2,Iris-setosa
100+
30,4.7,3.2,1.6,0.2,Iris-setosa
101+
36,5.0,3.2,1.2,0.2,Iris-setosa
102+
51,7.0,3.2,4.7,1.4,Iris-versicolor
103+
52,6.4,3.2,4.5,1.5,Iris-versicolor
104+
71,5.9,3.2,4.8,1.8,Iris-versicolor
105+
126,7.2,3.2,6.0,1.8,Iris-virginica
106+
111,6.5,3.2,5.1,2.0,Iris-virginica
107+
116,6.4,3.2,5.3,2.3,Iris-virginica
108+
144,6.8,3.2,5.9,2.3,Iris-virginica
109+
121,6.9,3.2,5.7,2.3,Iris-virginica
110+
50,5.0,3.3,1.4,0.2,Iris-setosa
111+
24,5.1,3.3,1.7,0.5,Iris-setosa
112+
57,6.3,3.3,4.7,1.6,Iris-versicolor
113+
125,6.7,3.3,5.7,2.1,Iris-virginica
114+
101,6.3,3.3,6.0,2.5,Iris-virginica
115+
145,6.7,3.3,5.7,2.5,Iris-virginica
116+
12,4.8,3.4,1.6,0.2,Iris-setosa
117+
25,4.8,3.4,1.9,0.2,Iris-setosa
118+
8,5.0,3.4,1.5,0.2,Iris-setosa
119+
40,5.1,3.4,1.5,0.2,Iris-setosa
120+
29,5.2,3.4,1.4,0.2,Iris-setosa
121+
21,5.4,3.4,1.7,0.2,Iris-setosa
122+
7,4.6,3.4,1.4,0.3,Iris-setosa
123+
27,5.0,3.4,1.6,0.4,Iris-setosa
124+
32,5.4,3.4,1.5,0.4,Iris-setosa
125+
86,6.0,3.4,4.5,1.6,Iris-versicolor
126+
149,6.2,3.4,5.4,2.3,Iris-virginica
127+
137,6.3,3.4,5.6,2.4,Iris-virginica
128+
1,5.1,3.5,1.4,0.2,Iris-setosa
129+
28,5.2,3.5,1.5,0.2,Iris-setosa
130+
37,5.5,3.5,1.3,0.2,Iris-setosa
131+
41,5.0,3.5,1.3,0.3,Iris-setosa
132+
18,5.1,3.5,1.4,0.3,Iris-setosa
133+
44,5.0,3.5,1.6,0.6,Iris-setosa
134+
23,4.6,3.6,1.0,0.2,Iris-setosa
135+
5,5.0,3.6,1.4,0.2,Iris-setosa
136+
110,7.2,3.6,6.1,2.5,Iris-virginica
137+
49,5.3,3.7,1.5,0.2,Iris-setosa
138+
11,5.4,3.7,1.5,0.2,Iris-setosa
139+
22,5.1,3.7,1.5,0.4,Iris-setosa
140+
47,5.1,3.8,1.6,0.2,Iris-setosa
141+
20,5.1,3.8,1.5,0.3,Iris-setosa
142+
19,5.7,3.8,1.7,0.3,Iris-setosa
143+
45,5.1,3.8,1.9,0.4,Iris-setosa
144+
132,7.9,3.8,6.4,2.0,Iris-virginica
145+
118,7.7,3.8,6.7,2.2,Iris-virginica
146+
6,5.4,3.9,1.7,0.4,Iris-setosa
147+
17,5.4,3.9,1.3,0.4,Iris-setosa
148+
15,5.8,4.0,1.2,0.2,Iris-setosa
149+
33,5.2,4.1,1.5,0.1,Iris-setosa
150+
34,5.5,4.2,1.4,0.2,Iris-setosa
151+
16,5.7,4.4,1.5,0.4,Iris-virginica

‎src/Main.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static void main (String[] args) throws Exception {
99
// in the same project
1010
boolean index = true;
1111
boolean header = true;
12-
String dataset = "Iris_unordered.csv";
12+
String dataset = "Iris_unordered_2.csv";
1313

1414
ClassificationOfFloatValues ob = new ClassificationOfFloatValues(dataset);
1515
ob.setIndex(true);

‎src/classification/ClassificationOfFloatValues.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class ClassificationOfFloatValues {
3030
// --- Classification result data variables
3131
private String[][][] predictedTestData;
3232
private int[][] sortedProbability;
33+
private int numberOfClasses;
3334

3435

3536
// Function to add the members of the class
@@ -91,8 +92,10 @@ public void evaluateResults() {
9192
DATA_evaluation evaluationObject = new DATA_evaluation(this.testDataResults,
9293
this.columnCount - this.numberOfTrainingData,
9394
this.predictedTestData,
94-
this.sortedProbability);
95-
evaluationObject.confusionMatrix();
95+
this.sortedProbability,
96+
this.numberOfClasses);
97+
evaluationObject.getConfusionMatrix();
98+
evaluationObject.getConfusionMatrixNormalized();
9699
}
97100
public void confusionMatrix() {
98101
if (this.MLAlgorithm == "DistanceClassification") {
@@ -146,6 +149,8 @@ public void distanceClassification (){
146149
classificationObject.setTestData(this.testDataPredictors, this.testDataResults, this.rowCount, this.columnCount - this.numberOfTrainingData);
147150
classificationObject.testModel();
148151

152+
this.numberOfClasses = classificationObject.getNumberOfClasses();
153+
149154
// Get the test data
150155
this.predictedTestData = classificationObject.getPredictedTestData();
151156
this.sortedProbability = classificationObject.getSortedProbability();

0 commit comments

Comments
 (0)