Commit Graph

120 Commits

Author SHA1 Message Date
b19778b796 Merge pull request 'Zmiana błędu w konstruktorze successor' (#37) from minor_upgrades into master
Reviewed-on: #37
2023-06-19 11:54:22 +02:00
majkellll
15839b4bc4 Zmiana błędu w konstruktorze successor 2023-06-19 11:54:14 +02:00
216de52583 Merge pull request 'recognize_garbage_photos' (#36) from recognize_garbage_photos into master
Reviewed-on: #36
2023-06-19 11:52:43 +02:00
Pawel Felcyn
58b53f5817 recognizing garbage 2023-06-18 21:01:45 +02:00
Pawel Felcyn
2d7ed16185 neuron network model 2023-06-17 18:33:23 +02:00
Pawel Felcyn
c267515ee1 rename test photos 2023-06-17 17:14:24 +02:00
Pawel Felcyn
aefba8e784 move test photos up 2023-06-17 17:08:30 +02:00
0824aaa0cf Merge pull request 'added neural network and model' (#35) from neuralNetwork into master
Reviewed-on: #35
2023-06-17 17:00:52 +02:00
maks
aa401ea87c added Neural network and model 2023-06-17 16:52:21 +02:00
73f6396a29 Delete 'machine_learning/neuralNetwork.py' 2023-06-17 16:52:17 +02:00
a21aa44601 Upload files to 'machine_learning' 2023-06-17 16:52:17 +02:00
6a364be40e Merge pull request 'Added photos of outside of train set' (#34) from trash_photos into master
Reviewed-on: #34
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-06-05 08:19:05 +02:00
2727588f82 Merge branch 'master' into trash_photos 2023-06-05 08:18:51 +02:00
majkellll
aef7b97b28 Added photos of outside of train set 2023-06-04 20:06:33 +02:00
d6ec2cda4c Merge pull request 'Added photos of garbage' (#33) from trash_photos into master
Reviewed-on: #33
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-06-04 08:48:17 +02:00
majkellll
def9f33cf4 Added photos of garbage 2023-06-03 23:00:06 +02:00
b997927e5d Merge pull request 'collecting_garbage' (#32) from collecting_garbage into master
Reviewed-on: #32
2023-06-03 14:43:15 +02:00
38c66cea53 strip classes 2023-05-29 12:00:46 +02:00
Pawel Felcyn
43c13acdee recognizing garbage 2023-05-29 09:57:52 +02:00
26bcc9ddf1 Merge pull request 'training data update' (#30) from s464933-patch-1 into master
Reviewed-on: #30
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-05-28 18:01:20 +02:00
Pawel Felcyn
301384ed80 model 2023-05-28 18:00:41 +02:00
5a56d61a5f training data update 2023-05-28 18:00:11 +02:00
5e2b673196 Merge pull request 'more trainig examples, model training' (#31) from decision_tree into master
Reviewed-on: #31
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-05-28 17:32:37 +02:00
Wiktor Szynaka
5339fbbe82 more trainig examples, model training 2023-05-28 02:50:07 +02:00
24f4c60e37 Merge pull request 'filled each garbage can with 4 pieces of garbage' (#28) from cvs_wypelnienie_smietnika into master
Reviewed-on: #28
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-05-27 14:58:33 +02:00
majkellll
d8e34ad65b delated test methods 2023-05-27 13:46:44 +02:00
majkellll
a1f2e4b298 garbage_pieces_counter 2023-05-27 13:45:31 +02:00
majkellll
f79fa2ee66 dodany przecinek 2023-05-27 13:35:39 +02:00
majkellll
1e5a1b9254 filled each garbage can with 4 pieces of garbage 2023-05-27 13:16:41 +02:00
c8bcea171e Merge pull request 'read csv with training data' (#27) from read_training_data into master
Reviewed-on: #27
2023-05-27 11:34:58 +02:00
Pawel Felcyn
6a05f59d97 read csv with training data 2023-05-27 11:34:26 +02:00
f60ed5d28f Merge pull request 'add training data pf' (#26) from pf_training_data into master
Reviewed-on: #26
2023-05-27 11:02:51 +02:00
Pawel Felcyn
4589d3a49c add training data pf 2023-05-27 11:01:22 +02:00
9287f76ea3 Merge pull request 'A_star' (#25) from A_star into master
Reviewed-on: #25
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-05-25 18:52:06 +02:00
majkellll
271e3365f9 A* gawor done 2023-05-25 18:18:11 +02:00
majkellll
aacee0e493 Merge remote-tracking branch 'origin/A_star' into A_star
# Conflicts:
#	bfs.py
#	main.py
#	movement.py
2023-05-15 11:50:30 +02:00
majkellll
15638862d3 A* working ok 2023-05-15 11:49:58 +02:00
majkellll
af32df4474 dodany A* - coś jeszcze nie działa 2023-05-15 11:04:09 +02:00
Pawel Felcyn
311a2d0757 astar for MIkołaj Gawor 2023-05-15 10:59:30 +02:00
majkellll
5440626353 dodany A* - coś jeszcze nie działa 2023-05-15 08:07:08 +02:00
dd34b7341a Merge pull request 'add heuristics' (#24) from heuristics into master
Reviewed-on: #24
2023-05-13 23:07:17 +02:00
Pawel Felcyn
c708663d39 add heuristics 2023-05-13 23:06:42 +02:00
65bef51958 Merge pull request 'SpeedBump' (#23) from SpeedBump into master
Reviewed-on: #23
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-05-13 22:05:20 +02:00
Wiktor Szynaka
a2d6cc688b correction 2023-05-13 21:17:30 +02:00
Wiktor Szynaka
f7c91e92aa deleted empty can enum 2023-05-13 21:04:57 +02:00
Wiktor Szynaka
b25a36e872 action costs 2023-05-13 21:00:13 +02:00
Wiktor Szynaka
76eb4771a2 add action cost function and remove node class 2023-05-13 20:20:04 +02:00
Wiktor Szynaka
4ab84deaf3 speed bumps 2023-05-13 20:02:42 +02:00
Wiktor Szynaka
f0d6001efa speed bumps 2023-05-13 19:41:19 +02:00
Wiktor Szynaka
af42c84186 speed bumps 2023-05-13 19:30:00 +02:00