Commit Graph

74 Commits

Author SHA1 Message Date
s481825 d0e8a47da1 Merge pull request 'astar_temp' (#19) from astar_temp into master
Reviewed-on: #19
2024-05-10 17:34:47 +02:00
Mateusz Czajka d150e9c21d Made function to test speed of A*.
Changed heuristic2.
2024-04-29 14:05:26 +02:00
Paulina Smierzchalska c0fe5766b0 fix: brakowalo total_cost przy wylowywaniu A_star2 w App.py 2024-04-28 13:17:08 +02:00
jakzar 92c893c917 This: -added road.jpg 2024-04-28 12:59:28 +02:00
jakzar 7c50b44417 This: -fixed cost sum in A* -added cost of direction change for A*2 -added function to change image of visited tile -added display of total cost 2024-04-28 12:58:58 +02:00
jakzar e448c80739 This: -simplified cost taking for A* 2024-04-28 11:51:47 +02:00
jakzar eb17e42686 Merge branch 'losowanie_celu' into astar_temp 2024-04-28 11:21:09 +02:00
Paulina Smierzchalska af15a10048 Dodanie wypisywanie kosztu do AStar1 i ustawiono staly koszt obrotu 2024-04-27 20:09:12 +02:00
tafit0902 702eff581a cel jest losowany w osobnej funkcji, dodano zdjecie stacji benzynowej jako cel trakotra 2024-04-27 00:59:48 +02:00
Mateusz Czajka 03434fdb79 Did heuristic2 and A_star2.
Fixed coordinate bug.
2024-04-26 16:32:50 +02:00
Paulina Smierzchalska 637b7567b4 Pierwsza wersja AStar 2024-04-25 22:56:18 +02:00
s481834 2017b89aa4 Merge pull request 'New surfaces were made (mud, dirt, stone).' (#18) from introduction_astar into astar
Reviewed-on: #18
2024-04-25 20:51:56 +02:00
Mateusz Czajka ae462e2920 New surfaces were made (mud, dirt, stone).
Renamed from bfs2 to bfs3.
Added koszt to Stan and it's set automatically.
Added some ideas about A*.
2024-04-24 22:16:34 +02:00
s481834 ab14a34ecf Merge pull request 'BFS' (#17) from BFS into master
Reviewed-on: #17
2024-04-24 17:44:08 +02:00
s481834 da6b3ef067 Merge pull request 'snake_move' (#16) from snake_move into BFS
Reviewed-on: #16
2024-04-24 17:41:46 +02:00
jakzar a696da09de -Added way to clear console -Support different dimmension of grid for console 2024-04-15 11:20:47 +02:00
jakzar e0397b95a7 -Added support to precalculated BFS2 -Added way to set HydrateValue by HydrateIndex -Minor changes in Tractor.py -Added flags to make handling different BFS implements easier 2024-04-15 10:49:25 +02:00
jakzar d38c4d9593 -Added garage -Fixed bugs that were causing crashes realted to mouse position out of the window 2024-04-15 10:02:09 +02:00
s481825 a8c5b1b434 Merge pull request 'Made BFS1 and BFS3 algorithm in BFS.py file.' (#15) from algorytm_bfs2 into snake_move
Reviewed-on: #15 reviewed by Jakub Zaręba
2024-04-15 09:25:33 +02:00
Mateusz Czajka 63229b2c60 Made BFS1 and BFS3 algorithm in BFS.py file. 2024-04-14 21:39:04 +02:00
s481834 066894d85c Merge pull request 'ruch_traktora_po_bfs' (#14) from ruch_traktora_po_bfs into snake_move
Reviewed-on: #14
2024-04-14 19:50:30 +02:00
tafit0902 2c03c4857c poprawki 2024-04-14 00:41:18 +02:00
tafit0902 fbe6a7e386 poprawa obrotu traktora 2024-04-14 00:13:27 +02:00
tafit0902 1578dd28f9 traktor porusza sie po scieszce bfs i nawadnia na sztywno pole 2024-04-13 23:55:58 +02:00
tafit0902 eb5556e514 poprawki 2024-04-13 23:49:04 +02:00
jakzar 9ca821bab8 -fixed a bug where mouse on the console would sometimes cause a crash 2024-04-13 02:09:49 +02:00
jakzar 7ac1093231 -fix in gap between lines -added option to disable console 2024-04-13 01:51:52 +02:00
jakzar 911876e59a -added initial_move to get all slot's hydrate stats by visiting all slots -added way to get hydrate stats for single slot -added console to print things there instead of terminal 2024-04-13 01:39:39 +02:00
jakzar 2dac7c64a9 -minor changes to move action (added do_move_if_valid) 2024-04-13 00:13:51 +02:00
s481825 999f28a405 Merge pull request 'Made BFS algorithm.' (#13) from algorytm_bfs into BFS
Reviewed-on: #13 by Jakub Zaręba
2024-04-13 00:02:29 +02:00
Mateusz Czajka ce698aa14a Made BFS algorithm. 2024-04-12 22:11:30 +02:00
s481834 901c246681 Merge pull request 'ruch_traktor_bfs' (#12) from ruch_traktor_bfs into BFS
Reviewed-on: #12
2024-04-12 20:44:17 +02:00
jakzar 18d2fdbb49 -Fixed direction changes 2024-04-12 09:12:38 +02:00
Paulina Smierzchalska ee2c65730d Zmiana organizacji ruchu traktora na wybieranie kierunku i ruchu w przód, jeszcze bez obrotów przed zmiana slota 2024-04-11 22:25:38 +02:00
s481834 05e028c171 Merge pull request 'ram' (#11) from ram into master
Reviewed-on: #11
2024-03-25 10:01:36 +01:00
jakzar a5691816ac -Merged classes slot and roslina. -Added function to display current status of plant. 2024-03-24 23:30:02 +01:00
Mateusz Czajka 4c9bbed441 Wprowadzono poprawki do klas Roslina, Stan oraz Akcja. 2024-03-24 19:19:49 +01:00
Paulina Smierzchalska be47ed188f dodado akcje do osprzetu i lekkie poprawki w klasie Akcja 2024-03-24 13:10:02 +01:00
tafit0902 17f6f36e77 dodanie klasy srodek oraz akcja 2024-03-24 12:31:56 +01:00
tafit0902 81ebfc91b6 komentarze i wyrzucenie chroby wirusowej 2024-03-24 12:17:44 +01:00
tafit0902 3fb9b77d38 poprawki 2024-03-24 12:01:41 +01:00
S481814 f2539c9fd0 Merge pull request 'traktor_osprzet' (#9) from traktor_osprzet into ram
Reviewed-on: #9
2024-03-24 11:58:35 +01:00
tafit0902 30d81744cf dodanie wiecej srodkow 2024-03-23 23:19:38 +01:00
tafit0902 78eb846720 dodano akcje oraz srodek, przykladowe srodki tworzone w akcjach 2024-03-23 23:17:51 +01:00
S481814 25ce2bb241 usunieto plik niewazny 4 2024-03-23 21:07:56 +01:00
S481814 8c1a8cb882 usunieto plik niewazny 3 2024-03-23 21:07:40 +01:00
S481814 97214964cd usunieto plik nieważny 2024-03-23 21:07:22 +01:00
S481814 8a89bbcf1f usunieto workspace 2024-03-23 21:07:01 +01:00
Paulina Smierzchalska c55f2b88c3 Dodano wpis do .gitignore 2024-03-23 21:04:45 +01:00
Paulina Smierzchalska 968e9641d7 traktor slot i klasa osprzet 2024-03-23 21:00:08 +01:00