Commit Graph

92 Commits

Author SHA1 Message Date
dff39e4d26 Merge pull request 'master' (#2) from s473616/sztuczna_inteligencja_2023_smieciarka:master into master
Reviewed-on: s464933/sztuczna_inteligencja_2023_smieciarka#2
2023-05-27 13:42:28 +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
aec533956d Merge pull request 'landfill' (#22) from landfill into master
Reviewed-on: #22
2023-05-11 21:38:44 +02:00
Pawel Felcyn
bb3fc2715f make dust car faster 2023-05-11 20:14:09 +02:00
Pawel Felcyn
94f301cae5 add landfill 2023-05-11 20:12:41 +02:00
eb7857323c Merge pull request 'finish_bfs' (#21) from finish_bfs into master
Reviewed-on: #21
2023-04-23 16:45:17 +02:00
Pawel Felcyn
69ce36b4e2 remove comented code 2023-04-23 16:43:32 +02:00
Pawel Felcyn
2ce57ea190 visit all garbage cans with bfs 2023-04-23 16:42:45 +02:00
ef1b0c23a9 Merge pull request 'garbageCan instantions' (#20) from s464933/sztuczna_inteligencja_2023_smieciarka:master into master
Reviewed-on: #20
2023-04-23 16:16:40 +02:00
b78f3cfa7b Update 'startup.py' 2023-04-23 15:40:34 +02:00
2fbf2be1d7 Update 'startup.py' 2023-04-23 15:37:22 +02:00
9f7ca5d0ed Update 'city.py' 2023-04-23 15:35:37 +02:00
cf525c5c4b Update 'city.py' 2023-04-23 15:34:29 +02:00
ca91fd4726 Merge pull request 'master' (#1) from s473616/sztuczna_inteligencja_2023_smieciarka:master into master
Reviewed-on: s464933/sztuczna_inteligencja_2023_smieciarka#1
2023-04-23 15:33:38 +02:00
675df76bfe Merge pull request 'bfs' (#19) from bfs into master
Reviewed-on: #19
2023-04-22 18:08:26 +02:00
Pawel Felcyn
c22e86e22b fix bfs 2023-04-22 18:06:50 +02:00
Pawel Felcyn
c5e6eadcae add function for moving dust car 2023-04-22 17:46:08 +02:00
Pawel Felcyn
d0d9fb0309 dust car instance 2023-04-22 16:36:13 +02:00
Pawel Felcyn
7c44d65347 implement bfs algorythm 2023-04-22 16:17:00 +02:00
Pawel Felcyn
f12eb5ba0d implement bfs algorythm 2023-04-22 16:16:36 +02:00
7ef1ccb0a3 Merge pull request 'states' (#18) from states into master
Reviewed-on: #18
2023-04-22 12:12:32 +02:00
Pawel Felcyn
2b10bb8650 garbage can cell type 2023-04-22 12:11:06 +02:00
Pawel Felcyn
9323b5a507 add agent action type 2023-04-22 12:06:01 +02:00
Pawel Felcyn
aba8285469 street grid cell type 2023-04-22 12:04:08 +02:00
Pawel Felcyn
ac19577346 add dust car rotation imgs 2023-04-22 11:45:32 +02:00
bdd5d1defb Merge pull request 'fix can and car imgs to be renerable' (#17) from dust_car_img_error into master
Reviewed-on: #17
2023-04-15 20:57:30 +02:00
Pawel Felcyn
5f1acbb6f8 fix can and car imgs to be renerable 2023-04-15 20:55:42 +02:00
77032672bc Merge pull request 'add method for rendering can' (#16) from render_can into master
Reviewed-on: #16
2023-04-15 19:46:05 +02:00
Pawel Felcyn
fa3868746a add method for rendering can 2023-04-15 19:37:56 +02:00
f937ce349f Merge pull request 'zmiana rozdzielczosci obrazkow' (#15) from imgs_update into master
Reviewed-on: #15
Reviewed-by: Paweł Felcyn <pawfel1@st.amu.edu.pl>
2023-04-05 19:32:11 +02:00