s462072/Trashmaster
s462072/Trashmaster
5
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Repaired prediction, changed dataset

Browse Source
This commit is contained in:
trzmielewskiR 2022-05-12 09:39:25 +02:00
parent 42d09e21f8
commit 7add741845
5 changed files with 239 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
decision_tree/decisionTree.py
View File

@ -11,11 +11,10 @@ time_since_flush = [1,2,3,4,5,6,7,8,9,10]
type_of_trash = {"bio":1, "szklo":2, "plastik":3, "papier":4, "mieszane":5} type_of_trash = {"bio":1, "szklo":2, "plastik":3, "papier":4, "mieszane":5}
access_to_bin = { "no":1, "yes":2} access_to_bin = { "no":1, "yes":2}
distance = [1,2,3,4,5,6,7,8,9,10] distance = [1,2,3,4,5,6,7,8,9,10]
decision = [1,2,3,4,5] decision = [0,1] - decyzje zostaną zmienione z tych z wagami na zero jedynkowe ze względu na pewne trudności w dalszej pracy
''' '''
decisions = ["decision"] decisions = ["decision"]
attributes = ["season", "enough_space_in_trashmaster", "time_since_flush", "type_of_trash", "access_to_bin", "distance", attributes = ["season", "enough_space_in_trashmaster", "time_since_flush", "type_of_trash", "access_to_bin", "distance"]
"decision"]
# return tree made from attributes # return tree made from attributes
@ -60,6 +59,10 @@ def tree_to_png(decision_tree):
def tree_to_structure(decision_tree): def tree_to_structure(decision_tree):
joblib.dump(decision_tree, './decision_tree/tree_model') joblib.dump(decision_tree, './decision_tree/tree_model')
def tree_from_structure(file):
return joblib.load(file)
#drzewo = tree() #drzewo = tree()
#tree_as_txt(drzewo) #tree_as_txt(drzewo)
#tree_to_png(drzewo) #tree_to_png(drzewo)

170
decision_tree/drzewo_decyzyjne.csv
View File

@ -2,30 +2,30 @@ season,enough_space_in_trashmaster,time_since_flush,type_of_trash,access_to_bin,
2,2,1,1,2,10,1 2,2,1,1,2,10,1
2,2,2,2,2,8,1 2,2,2,2,2,8,1
2,2,3,3,2,6,1 2,2,3,3,2,6,1
2,2,4,4,2,4,2 2,2,4,4,2,4,0
2,2,5,5,2,2,3 2,2,5,5,2,2,0
2,2,6,1,2,1,5 2,2,6,1,2,1,1
2,2,7,2,2,3,4 2,2,7,2,2,3,1
2,2,8,3,2,5,4 2,2,8,3,2,5,0
2,2,9,4,2,7,3 2,2,9,4,2,7,0
2,2,10,5,2,9,5 2,2,10,5,2,9,1
2,2,1,1,2,2,1 2,2,1,1,2,2,0
2,2,2,2,2,1,1 2,2,2,2,2,1,1
2,2,3,3,2,3,2 2,2,3,3,2,3,0
2,2,4,4,2,4,2 2,2,4,4,2,4,1
2,2,5,5,2,5,3 2,2,5,5,2,5,0
2,2,6,1,2,6,3 2,2,6,1,2,6,1
2,2,7,2,2,7,2 2,2,7,2,2,7,0
2,2,8,3,2,8,2 2,2,8,3,2,8,1
2,2,9,4,2,9,4 2,2,9,4,2,9,0
2,2,10,5,2,10,4 2,2,10,5,2,10,1
2,2,1,1,2,7,1 2,2,1,1,2,7,1
2,2,2,2,2,6,2 2,2,2,2,2,6,0
2,2,3,3,2,5,3 2,2,3,3,2,5,1
2,2,4,4,1,4,0 2,2,4,4,1,4,0
2,2,5,5,1,3,0 2,2,5,5,1,3,0
2,2,6,1,1,2,0 2,2,6,1,1,2,0
2,2,7,2,1,1,0 2,2,7,2,1,1,1
2,2,8,3,1,9,0 2,2,8,3,1,9,0
2,2,9,4,1,8,0 2,2,9,4,1,8,0
2,2,10,5,1,7,0 2,2,10,5,1,7,0
@ -51,24 +51,24 @@ season,enough_space_in_trashmaster,time_since_flush,type_of_trash,access_to_bin,
2,1,10,5,2,9,0 2,1,10,5,2,9,0
3,2,1,1,2,2,1 3,2,1,1,2,2,1
3,2,2,2,2,1,1 3,2,2,2,2,1,1
3,2,3,3,2,4,2 3,2,3,3,2,4,1
3,2,4,4,2,3,3 3,2,4,4,2,3,0
3,2,5,5,2,6,4 3,2,5,5,2,6,1
3,2,6,1,2,5,4 3,2,6,1,2,5,1
3,2,7,2,2,8,3 3,2,7,2,2,8,0
3,2,8,3,2,7,3 3,2,8,3,2,7,1
3,2,9,4,2,9,4 3,2,9,4,2,9,1
3,2,10,5,2,10,5 3,2,10,5,2,10,0
3,2,1,1,2,7,1 3,2,1,1,2,7,1
3,2,2,2,2,6,1 3,2,2,2,2,6,1
3,2,3,3,2,4,3 3,2,3,3,2,4,1
3,2,4,4,2,1,3 3,2,4,4,2,1,0
3,2,5,5,2,2,4 3,2,5,5,2,2,1
3,2,6,1,2,3,4 3,2,6,1,2,3,1
3,2,7,2,2,9,3 3,2,7,2,2,9,0
3,2,8,3,2,8,3 3,2,8,3,2,8,0
3,2,9,4,2,5,5 3,2,9,4,2,5,1
3,2,10,5,2,4,5 3,2,10,5,2,4,0
3,2,1,1,2,1,1 3,2,1,1,2,1,1
3,2,2,2,1,7,0 3,2,2,2,1,7,0
3,2,3,3,1,9,0 3,2,3,3,1,9,0
@ -99,3 +99,103 @@ season,enough_space_in_trashmaster,time_since_flush,type_of_trash,access_to_bin,
3,1,8,3,2,9,0 3,1,8,3,2,9,0
3,1,9,4,2,9,0 3,1,9,4,2,9,0
3,1,10,5,2,1,0 3,1,10,5,2,1,0
4,2,1,1,2,9,1
4,2,2,2,2,7,1
4,2,3,3,2,5,1
4,2,4,4,2,3,1
4,2,5,5,2,1,1
4,2,6,1,2,2,1
4,2,7,2,2,2,1
4,2,8,3,2,4,1
4,2,9,4,2,6,1
4,2,10,5,2,8,1
4,2,1,1,2,1,1
4,2,2,2,2,3,1
4,2,3,3,2,5,1
4,2,4,4,2,6,1
4,2,5,5,2,4,1
4,2,6,1,2,5,1
4,2,7,2,2,6,1
4,2,8,3,2,7,1
4,2,9,4,2,8,1
4,2,10,5,2,10,1
4,2,1,1,2,6,1
4,2,7,2,2,3,1
4,2,8,3,2,5,1
4,2,9,4,2,7,1
4,2,10,5,2,9,1
4,2,1,1,2,2,1
4,2,7,2,1,1,0
4,2,8,3,1,9,0
4,2,9,4,1,8,0
4,2,10,5,1,7,0
4,2,1,1,1,3,0
4,2,2,2,1,2,0
4,2,3,3,1,1,0
4,2,4,4,1,4,0
4,2,5,5,1,5,0
4,2,6,1,1,6,0
4,2,7,2,1,10,0
4,2,8,3,1,9,0
4,2,9,4,1,8,0
4,2,10,5,1,7,0
4,2,1,1,1,2,0
4,2,2,2,1,4,0
4,2,3,3,1,6,0
4,2,4,4,1,8,0
4,2,5,5,2,10,1
4,2,6,1,2,1,1
4,1,2,2,2,5,1
4,1,3,3,2,4,1
4,1,4,4,1,3,0
4,1,5,5,1,2,0
4,1,6,1,1,1,0
1,2,2,2,2,1,1
1,2,3,3,2,4,1
1,2,4,4,2,3,1
1,2,5,5,2,6,1
1,2,6,1,2,5,1
1,2,7,2,2,8,1
1,2,8,3,2,7,1
1,2,9,4,2,9,1
1,2,10,5,2,10,1
1,2,1,1,2,7,1
1,2,2,2,2,6,1
1,2,3,3,2,4,0
1,2,4,4,2,1,1
1,2,5,5,2,2,1
1,2,6,1,2,3,1
1,2,7,2,2,9,1
1,2,8,3,2,8,0
1,2,9,4,2,5,1
1,2,10,5,2,4,1
1,2,1,1,2,1,1
1,2,2,2,1,7,0
1,2,3,3,1,9,0
1,2,4,4,1,10,0
1,2,5,5,1,3,0
1,2,6,1,1,2,0
1,2,7,2,1,5,0
1,2,8,3,1,6,0
1,2,9,4,1,8,0
1,2,10,5,1,3,0
1,2,1,1,1,1,0
1,2,2,2,1,2,0
1,2,3,3,1,6,0
1,2,4,4,1,9,0
1,2,5,5,1,7,0
1,2,6,1,1,4,0
1,2,7,2,1,3,0
1,2,8,3,1,5,0
1,2,9,4,1,10,0
1,2,10,5,1,8,0
1,2,1,1,2,2,1
1,1,2,2,2,4,0
1,1,3,3,2,6,0
1,1,4,4,2,7,0
1,1,5,5,2,1,0
1,1,6,1,2,9,0
1,1,7,2,2,3,0
1,1,8,3,2,9,0
1,1,9,4,2,9,0
1,1,10,5,2,1,0

1 season enough_space_in_trashmaster time_since_flush type_of_trash access_to_bin distance decision
2 2 2 1 1 2 10 1
3 2 2 2 2 2 8 1
4 2 2 3 3 2 6 1
5 2 2 4 4 2 4 2 0
6 2 2 5 5 2 2 3 0
7 2 2 6 1 2 1 5 1
8 2 2 7 2 2 3 4 1
9 2 2 8 3 2 5 4 0
10 2 2 9 4 2 7 3 0
11 2 2 10 5 2 9 5 1
12 2 2 1 1 2 2 1 0
13 2 2 2 2 2 1 1
14 2 2 3 3 2 3 2 0
15 2 2 4 4 2 4 2 1
16 2 2 5 5 2 5 3 0
17 2 2 6 1 2 6 3 1
18 2 2 7 2 2 7 2 0
19 2 2 8 3 2 8 2 1
20 2 2 9 4 2 9 4 0
21 2 2 10 5 2 10 4 1
22 2 2 1 1 2 7 1
23 2 2 2 2 2 6 2 0
24 2 2 3 3 2 5 3 1
25 2 2 4 4 1 4 0
26 2 2 5 5 1 3 0
27 2 2 6 1 1 2 0
28 2 2 7 2 1 1 0 1
29 2 2 8 3 1 9 0
30 2 2 9 4 1 8 0
31 2 2 10 5 1 7 0
51 2 1 10 5 2 9 0
52 3 2 1 1 2 2 1
53 3 2 2 2 2 1 1
54 3 2 3 3 2 4 2 1
55 3 2 4 4 2 3 3 0
56 3 2 5 5 2 6 4 1
57 3 2 6 1 2 5 4 1
58 3 2 7 2 2 8 3 0
59 3 2 8 3 2 7 3 1
60 3 2 9 4 2 9 4 1
61 3 2 10 5 2 10 5 0
62 3 2 1 1 2 7 1
63 3 2 2 2 2 6 1
64 3 2 3 3 2 4 3 1
65 3 2 4 4 2 1 3 0
66 3 2 5 5 2 2 4 1
67 3 2 6 1 2 3 4 1
68 3 2 7 2 2 9 3 0
69 3 2 8 3 2 8 3 0
70 3 2 9 4 2 5 5 1
71 3 2 10 5 2 4 5 0
72 3 2 1 1 2 1 1
73 3 2 2 2 1 7 0
74 3 2 3 3 1 9 0
99 3 1 8 3 2 9 0
100 3 1 9 4 2 9 0
101 3 1 10 5 2 1 0
102 4 2 1 1 2 9 1
103 4 2 2 2 2 7 1
104 4 2 3 3 2 5 1
105 4 2 4 4 2 3 1
106 4 2 5 5 2 1 1
107 4 2 6 1 2 2 1
108 4 2 7 2 2 2 1
109 4 2 8 3 2 4 1
110 4 2 9 4 2 6 1
111 4 2 10 5 2 8 1
112 4 2 1 1 2 1 1
113 4 2 2 2 2 3 1
114 4 2 3 3 2 5 1
115 4 2 4 4 2 6 1
116 4 2 5 5 2 4 1
117 4 2 6 1 2 5 1
118 4 2 7 2 2 6 1
119 4 2 8 3 2 7 1
120 4 2 9 4 2 8 1
121 4 2 10 5 2 10 1
122 4 2 1 1 2 6 1
123 4 2 7 2 2 3 1
124 4 2 8 3 2 5 1
125 4 2 9 4 2 7 1
126 4 2 10 5 2 9 1
127 4 2 1 1 2 2 1
128 4 2 7 2 1 1 0
129 4 2 8 3 1 9 0
130 4 2 9 4 1 8 0
131 4 2 10 5 1 7 0
132 4 2 1 1 1 3 0
133 4 2 2 2 1 2 0
134 4 2 3 3 1 1 0
135 4 2 4 4 1 4 0
136 4 2 5 5 1 5 0
137 4 2 6 1 1 6 0
138 4 2 7 2 1 10 0
139 4 2 8 3 1 9 0
140 4 2 9 4 1 8 0
141 4 2 10 5 1 7 0
142 4 2 1 1 1 2 0
143 4 2 2 2 1 4 0
144 4 2 3 3 1 6 0
145 4 2 4 4 1 8 0
146 4 2 5 5 2 10 1
147 4 2 6 1 2 1 1
148 4 1 2 2 2 5 1
149 4 1 3 3 2 4 1
150 4 1 4 4 1 3 0
151 4 1 5 5 1 2 0
152 4 1 6 1 1 1 0
153 1 2 2 2 2 1 1
154 1 2 3 3 2 4 1
155 1 2 4 4 2 3 1
156 1 2 5 5 2 6 1
157 1 2 6 1 2 5 1
158 1 2 7 2 2 8 1
159 1 2 8 3 2 7 1
160 1 2 9 4 2 9 1
161 1 2 10 5 2 10 1
162 1 2 1 1 2 7 1
163 1 2 2 2 2 6 1
164 1 2 3 3 2 4 0
165 1 2 4 4 2 1 1
166 1 2 5 5 2 2 1
167 1 2 6 1 2 3 1
168 1 2 7 2 2 9 1
169 1 2 8 3 2 8 0
170 1 2 9 4 2 5 1
171 1 2 10 5 2 4 1
172 1 2 1 1 2 1 1
173 1 2 2 2 1 7 0
174 1 2 3 3 1 9 0
175 1 2 4 4 1 10 0
176 1 2 5 5 1 3 0
177 1 2 6 1 1 2 0
178 1 2 7 2 1 5 0
179 1 2 8 3 1 6 0
180 1 2 9 4 1 8 0
181 1 2 10 5 1 3 0
182 1 2 1 1 1 1 0
183 1 2 2 2 1 2 0
184 1 2 3 3 1 6 0
185 1 2 4 4 1 9 0
186 1 2 5 5 1 7 0
187 1 2 6 1 1 4 0
188 1 2 7 2 1 3 0
189 1 2 8 3 1 5 0
190 1 2 9 4 1 10 0
191 1 2 10 5 1 8 0
192 1 2 1 1 2 2 1
193 1 1 2 2 2 4 0
194 1 1 3 3 2 6 0
195 1 1 4 4 2 7 0
196 1 1 5 5 2 1 0
197 1 1 6 1 2 9 0
198 1 1 7 2 2 3 0
199 1 1 8 3 2 9 0
200 1 1 9 4 2 9 0
201 1 1 10 5 2 1 0

110
decision_tree/tree_as_txt.txt
View File

@ -1,16 +1,94 @@
|--- feature_6 <= 0.50 |--- feature_4 <= 1.50
| |--- class: 0 | |--- feature_5 <= 1.50
|--- feature_6 > 0.50 | | |--- feature_2 <= 6.50
| |--- feature_6 <= 1.50 | | | |--- class: 0
| | |--- class: 1 | | |--- feature_2 > 6.50
| |--- feature_6 > 1.50 | | | |--- feature_0 <= 3.00
| | |--- feature_6 <= 3.50 | | | | |--- class: 1
| | | |--- feature_6 <= 2.50 | | | |--- feature_0 > 3.00
| | | | |--- class: 2 | | | | |--- class: 0
| | | |--- feature_6 > 2.50 | |--- feature_5 > 1.50
| | | | |--- class: 3 | | |--- class: 0
| | |--- feature_6 > 3.50 |--- feature_4 > 1.50
| | | |--- feature_6 <= 4.50 | |--- feature_1 <= 1.50
| | | | |--- class: 4 | | |--- feature_0 <= 3.50
| | | |--- feature_6 > 4.50 | | | |--- class: 0
| | | | |--- class: 5 | | |--- feature_0 > 3.50
| | | |--- class: 1
| |--- feature_1 > 1.50
| | |--- feature_0 <= 3.50
| | | |--- feature_0 <= 1.50
| | | | |--- feature_3 <= 2.50
| | | | | |--- class: 1
| | | | |--- feature_3 > 2.50
| | | | | |--- feature_3 <= 3.50
| | | | | | |--- feature_5 <= 7.50
| | | | | | | |--- feature_2 <= 5.50
| | | | | | | | |--- class: 0
| | | | | | | |--- feature_2 > 5.50
| | | | | | | | |--- class: 1
| | | | | | |--- feature_5 > 7.50
| | | | | | | |--- class: 0
| | | | | |--- feature_3 > 3.50
| | | | | | |--- class: 1
| | | |--- feature_0 > 1.50
| | | | |--- feature_3 <= 1.50
| | | | | |--- feature_5 <= 2.50
| | | | | | |--- feature_5 <= 1.50
| | | | | | | |--- class: 1
| | | | | | |--- feature_5 > 1.50
| | | | | | | |--- feature_0 <= 2.50
| | | | | | | | |--- class: 0
| | | | | | | |--- feature_0 > 2.50
| | | | | | | | |--- class: 1
| | | | | |--- feature_5 > 2.50
| | | | | | |--- class: 1
| | | | |--- feature_3 > 1.50
| | | | | |--- feature_2 <= 3.50
| | | | | | |--- feature_0 <= 2.50
| | | | | | | |--- feature_5 <= 2.00
| | | | | | | | |--- class: 1
| | | | | | | |--- feature_5 > 2.00
| | | | | | | | |--- feature_5 <= 4.00
| | | | | | | | | |--- class: 0
| | | | | | | | |--- feature_5 > 4.00
| | | | | | | | | |--- feature_3 <= 2.50
| | | | | | | | | | |--- feature_5 <= 7.00
| | | | | | | | | | | |--- class: 0
| | | | | | | | | | |--- feature_5 > 7.00
| | | | | | | | | | | |--- class: 1
| | | | | | | | | |--- feature_3 > 2.50
| | | | | | | | | | |--- class: 1
| | | | | | |--- feature_0 > 2.50
| | | | | | | |--- class: 1
| | | | | |--- feature_2 > 3.50
| | | | | | |--- feature_5 <= 1.50
| | | | | | | |--- class: 0
| | | | | | |--- feature_5 > 1.50
| | | | | | | |--- feature_3 <= 2.50
| | | | | | | | |--- feature_5 <= 5.00
| | | | | | | | | |--- class: 1
| | | | | | | | |--- feature_5 > 5.00
| | | | | | | | | |--- class: 0
| | | | | | | |--- feature_3 > 2.50
| | | | | | | | |--- feature_5 <= 5.50
| | | | | | | | | |--- feature_0 <= 2.50
| | | | | | | | | | |--- feature_2 <= 4.50
| | | | | | | | | | | |--- class: 0
| | | | | | | | | | |--- feature_2 > 4.50
| | | | | | | | | | | |--- class: 0
| | | | | | | | | |--- feature_0 > 2.50
| | | | | | | | | | |--- feature_2 <= 4.50
| | | | | | | | | | | |--- class: 0
| | | | | | | | | | |--- feature_2 > 4.50
| | | | | | | | | | | |--- truncated branch of depth 2
| | | | | | | | |--- feature_5 > 5.50
| | | | | | | | | |--- feature_5 <= 6.50
| | | | | | | | | | |--- class: 1
| | | | | | | | | |--- feature_5 > 6.50
| | | | | | | | | | |--- feature_2 <= 8.50
| | | | | | | | | | | |--- truncated branch of depth 3
| | | | | | | | | | |--- feature_2 > 8.50
| | | | | | | | | | | |--- truncated branch of depth 4
| | |--- feature_0 > 3.50
| | | |--- class: 1

BIN
decision_tree/tree_model
View File

Binary file not shown.

4
main.py
View File

@ -20,6 +20,10 @@ def printTree():
decisionTree.tree_as_txt(tree) decisionTree.tree_as_txt(tree)
decisionTree.tree_to_png(tree) decisionTree.tree_to_png(tree)
decisionTree.tree_to_structure(tree) decisionTree.tree_to_structure(tree)
drzewo = decisionTree.tree_from_structure('./decision_tree/tree_model')
print("Dla losowych danych predykcja czy wziąć kosz to: ")
dec = decisionTree.decision(drzewo, 4, 2, 7, 4, 2, 3)
print(dec)
class Game(): class Game():