Commit Graph

  • 366716a32b Merge pull request 'Merge master with genetic_algorithms branch' (#29) from genetic_algorithms into master master s481825 2024-06-09 18:40:57 +0200
  • 99c709d271 Merge pull request 'Merge genetic_algorithms with final_show branch' (#28) from final_show into genetic_algorithms #29 genetic_algorithms s481825 2024-06-09 18:40:24 +0200
  • b78f7f5ee7 Merge pull request 'Merge genetic2 to final_show' (#27) from genetic2 into final_show #28 final_show s481825 2024-06-09 18:39:27 +0200
  • eb2529831a This: -added goaltressure in bfs3 call in App.py -changed def value for randomGT in BFS3 in bfs.py -added more context to readme.txt #27 genetic2 jakzar 2024-06-09 18:33:50 +0200
  • d61b585827 Corrected GeneticAlgorithm2 and made a GeneticAlgorithm3 and generated fields using them. Made GeneticAccuracy to check the performance of the algorithms. Mateusz Czajka 2024-06-08 23:25:08 +0200
  • 6c86eebd89 genetic algorithm 2 with a value of None Paulina Smierzchalska 2024-06-07 18:41:55 +0200
  • da1bfe1d8f This: -changed readme.txt jakzar 2024-06-07 15:29:26 +0200
  • 4339284c4b This: -changed label for decision -changed goaltressure for BFS3 jakzar 2024-06-07 15:01:15 +0200
  • 51a5b13669 ladowanie pola z pliku GA, rozpoznawanie zdjec na polu, decyzja o podlaniu tafit0902 2024-06-07 00:02:36 +0200
  • 0becd1b1f6 Made genetic algorithm and made a field using it. Mateusz Czajka 2024-06-06 08:35:36 +0200
  • eb9744f52f Merge pull request 'refactor' (#26) from refactor into master s481834 2024-06-04 13:25:07 +0200
  • ea6a9f5204 Merge pull request 'neural_network' (#25) from neural_network into refactor #26 refactor s481834 2024-06-04 13:23:15 +0200
  • 7a3c30bd2f Added some trained models. #25 neural_network Mateusz Czajka 2024-06-04 13:18:15 +0200
  • 53ec8e993e Merge pull request 'Merge with model for 2 crops only' (#23) from neural_network_two_crops into neural_network s481825 2024-06-04 12:45:15 +0200
  • 24724fb8b7 This: -added trained model for 2 crops -added way to choose which model should we use #23 neural_network_two_crops jakzar 2024-06-04 12:40:39 +0200
  • 16302f4d6c Merge pull request 'Merge old branches to refactor due to merge it with master' (#22) from tree into refactor s481825 2024-06-04 11:36:13 +0200
  • 6959afe81a Merge pull request 'This: -small refactor in print' (#21) from tree_tractor_move into tree #22 tree s481825 2024-06-04 11:32:36 +0200
  • 58e958ac44 This: -small refactor in print #21 tree_tractor_move jakzar 2024-06-04 11:32:07 +0200
  • 38c1adb054 This: -improved printing of results -fixed a bug where picking tomato fertilizer caused crash -added trained model_500_hidden.pth trained with 500 hidden layers jakzar 2024-05-27 09:01:51 +0200
  • ccd1cb2359 Trained the model. Mateusz Czajka 2024-05-26 18:41:55 +0200
  • 5d7b68fdd6 This: -removed model.pth from git tracking for now -added corn to dataset jakzar 2024-05-26 14:46:12 +0200
  • 34bfe78218 This: -fixed line where device for training was always cuda device jakzar 2024-05-26 14:39:05 +0200
  • 26c99ddc55 This: -enchanced image dataset -fixed a bug where images where not loaded -fixed a bug where tractor wasnt moving -fixed a bug where training on gpu caused a crash jakzar 2024-05-26 13:58:48 +0200
  • d2abac6ebd roslina umiera po zlym nawiezieniu tafit0902 2024-05-26 01:55:40 +0200
  • de0740d34b losowanie bez powtorzen, poprawki w wyswieltaniu konsoli tafit0902 2024-05-26 01:37:01 +0200
  • 3c6e79a1fd losowanie zdjecia dla slotu, poruszanie sie traktora, uzycie sieci tafit0902 2024-05-26 01:08:47 +0200
  • f38a52e135 dodanie podstaw sieci nuronowej tafit0902 2024-05-25 02:00:19 +0200
  • 971746a0f8 This: -improved quality of tree visualization -fixed a bug where season cycle was not working properly jakzar 2024-05-12 22:53:41 +0200
  • afae656d76 dodatkowe dane Paulina Smierzchalska 2024-05-12 21:39:01 +0200
  • 9ebac46bef This: -fixed a bug where tractor_water_level and move delay was called in wrong place jakzar 2024-05-12 17:34:27 +0200
  • 0b494d694d This: -removed unused move in tree_move -changed display to table form in terminal -small refactoring due to code clean jakzar 2024-05-12 14:59:23 +0200
  • 3713ccc8ff This: -made graph bigger jakzar 2024-05-12 13:58:57 +0200
  • 7a14a94b1e traktor porusza sie po polu i decyduje czy podlac na podstawie drzewa decyzyjnego tafit0902 2024-05-11 22:05:02 +0200
  • 7c7a485d6b Made an algorithm to generate data (treeData.py) Mateusz Czajka 2024-05-11 18:30:14 +0200
  • d2d7a98a84 This: -changed decision from int to string values jakzar 2024-05-11 14:30:29 +0200
  • b377c5ea24 This: -added tree.png to .gitignore to prevent mistakes jakzar 2024-05-11 14:21:26 +0200
  • 12d2ba0d81 This: -added tree saving to .png file -added usage of decision tree -added way to get current status of all conditions -small improvements -switched off road and mud generation -changed order in .csv file to more logical jakzar 2024-05-11 14:18:40 +0200
  • 48b159ae02 This: -switched diseases from string to int values jakzar 2024-05-11 13:31:06 +0200
  • de69592612 This: -turned off gas station drawing jakzar 2024-05-11 13:25:36 +0200
  • 51fe19a071 This: -switched data for tree from strings to int -broke weather atributte to temperature and rain -added waterLevel for tractor jakzar 2024-05-11 13:24:09 +0200
  • f8a3156678 This: -renamed tree.py to Drzewo.py -added dataTree.csv -added basic function connected to decision tree -added required packages to readme.txt jakzar 2024-05-10 19:41:13 +0200
  • e6c86e7856 This: -added readme file jakzar 2024-05-10 18:39:26 +0200
  • 01a3d1864b This: -added Tree.py jakzar 2024-05-10 18:34:52 +0200
  • feeca26892 This: -added weather cycle jakzar 2024-05-10 18:33:38 +0200
  • 2b3170d10c This: -refactor few lines to disable Astar related functions and behaviour jakzar 2024-05-10 17:47:05 +0200
  • d0e8a47da1 Merge pull request 'astar_temp' (#19) from astar_temp into master s481825 2024-05-10 17:34:47 +0200
  • d150e9c21d Made function to test speed of A*. Changed heuristic2. #19 astar_temp Mateusz Czajka 2024-04-29 14:05:26 +0200
  • c0fe5766b0 fix: brakowalo total_cost przy wylowywaniu A_star2 w App.py Paulina Smierzchalska 2024-04-28 13:17:08 +0200
  • 92c893c917 This: -added road.jpg jakzar 2024-04-28 12:59:28 +0200
  • 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 jakzar 2024-04-28 12:58:58 +0200
  • e448c80739 This: -simplified cost taking for A* jakzar 2024-04-28 11:51:47 +0200
  • eb17e42686 Merge branch 'losowanie_celu' into astar_temp jakzar 2024-04-28 11:21:09 +0200
  • af15a10048 Dodanie wypisywanie kosztu do AStar1 i ustawiono staly koszt obrotu algorytm_astar1 Paulina Smierzchalska 2024-04-27 20:09:12 +0200
  • 702eff581a cel jest losowany w osobnej funkcji, dodano zdjecie stacji benzynowej jako cel trakotra losowanie_celu tafit0902 2024-04-27 00:59:48 +0200
  • 03434fdb79 Did heuristic2 and A_star2. Fixed coordinate bug. Mateusz Czajka 2024-04-26 16:32:50 +0200
  • 637b7567b4 Pierwsza wersja AStar Paulina Smierzchalska 2024-04-25 22:56:18 +0200
  • 2017b89aa4 Merge pull request 'New surfaces were made (mud, dirt, stone).' (#18) from introduction_astar into astar astar s481834 2024-04-25 20:51:56 +0200
  • 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*. #18 introduction_astar Mateusz Czajka 2024-04-24 22:16:34 +0200
  • ab14a34ecf Merge pull request 'BFS' (#17) from BFS into master s481834 2024-04-24 17:44:08 +0200
  • da6b3ef067 Merge pull request 'snake_move' (#16) from snake_move into BFS #17 BFS s481834 2024-04-24 17:41:46 +0200
  • a696da09de -Added way to clear console -Support different dimmension of grid for console #16 snake_move jakzar 2024-04-15 11:20:47 +0200
  • 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 jakzar 2024-04-15 10:49:25 +0200
  • d38c4d9593 -Added garage -Fixed bugs that were causing crashes realted to mouse position out of the window jakzar 2024-04-15 10:02:09 +0200
  • a8c5b1b434 Merge pull request 'Made BFS1 and BFS3 algorithm in BFS.py file.' (#15) from algorytm_bfs2 into snake_move s481825 2024-04-15 09:25:33 +0200
  • 63229b2c60 Made BFS1 and BFS3 algorithm in BFS.py file. #15 algorytm_bfs2 Mateusz Czajka 2024-04-14 21:39:04 +0200
  • 066894d85c Merge pull request 'ruch_traktora_po_bfs' (#14) from ruch_traktora_po_bfs into snake_move s481834 2024-04-14 19:50:30 +0200
  • 2c03c4857c poprawki #14 ruch_traktora_po_bfs tafit0902 2024-04-14 00:41:18 +0200
  • fbe6a7e386 poprawa obrotu traktora tafit0902 2024-04-14 00:13:27 +0200
  • 1578dd28f9 traktor porusza sie po scieszce bfs i nawadnia na sztywno pole tafit0902 2024-04-13 23:55:58 +0200
  • eb5556e514 poprawki tafit0902 2024-04-13 23:49:04 +0200
  • 9ca821bab8 -fixed a bug where mouse on the console would sometimes cause a crash jakzar 2024-04-13 02:09:49 +0200
  • 7ac1093231 -fix in gap between lines -added option to disable console jakzar 2024-04-13 01:51:52 +0200
  • 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 jakzar 2024-04-13 01:39:39 +0200
  • 2dac7c64a9 -minor changes to move action (added do_move_if_valid) jakzar 2024-04-13 00:13:51 +0200
  • 999f28a405 Merge pull request 'Made BFS algorithm.' (#13) from algorytm_bfs into BFS s481825 2024-04-13 00:02:29 +0200
  • ce698aa14a Made BFS algorithm. #13 algorytm_bfs Mateusz Czajka 2024-04-12 22:11:30 +0200
  • 901c246681 Merge pull request 'ruch_traktor_bfs' (#12) from ruch_traktor_bfs into BFS s481834 2024-04-12 20:44:17 +0200
  • 18d2fdbb49 -Fixed direction changes #12 ruch_traktor_bfs jakzar 2024-04-12 09:12:38 +0200
  • ee2c65730d Zmiana organizacji ruchu traktora na wybieranie kierunku i ruchu w przód, jeszcze bez obrotów przed zmiana slota Paulina Smierzchalska 2024-04-11 22:25:38 +0200
  • 05e028c171 Merge pull request 'ram' (#11) from ram into master s481834 2024-03-25 10:01:36 +0100
  • a5691816ac -Merged classes slot and roslina. -Added function to display current status of plant. #11 ram jakzar 2024-03-24 23:30:02 +0100
  • 4c9bbed441 Wprowadzono poprawki do klas Roslina, Stan oraz Akcja. Mateusz Czajka 2024-03-24 19:19:49 +0100
  • be47ed188f dodado akcje do osprzetu i lekkie poprawki w klasie Akcja Paulina Smierzchalska 2024-03-24 13:10:02 +0100
  • 17f6f36e77 dodanie klasy srodek oraz akcja tafit0902 2024-03-24 12:31:56 +0100
  • 81ebfc91b6 komentarze i wyrzucenie chroby wirusowej #10 srodek_akcja tafit0902 2024-03-24 12:14:23 +0100
  • 3fb9b77d38 poprawki tafit0902 2024-03-24 12:01:41 +0100
  • f2539c9fd0 Merge pull request 'traktor_osprzet' (#9) from traktor_osprzet into ram S481814 2024-03-24 11:58:35 +0100
  • 30d81744cf dodanie wiecej srodkow tafit0902 2024-03-23 23:19:38 +0100
  • 78eb846720 dodano akcje oraz srodek, przykladowe srodki tworzone w akcjach tafit0902 2024-03-23 23:17:51 +0100
  • 25ce2bb241 usunieto plik niewazny 4 #9 traktor_osprzet S481814 2024-03-23 21:07:56 +0100
  • 8c1a8cb882 usunieto plik niewazny 3 S481814 2024-03-23 21:07:40 +0100
  • 97214964cd usunieto plik nieważny S481814 2024-03-23 21:07:22 +0100
  • 8a89bbcf1f usunieto workspace S481814 2024-03-23 21:07:01 +0100
  • c55f2b88c3 Dodano wpis do .gitignore Paulina Smierzchalska 2024-03-23 21:04:45 +0100
  • 968e9641d7 traktor slot i klasa osprzet Paulina Smierzchalska 2024-03-23 21:00:08 +0100
  • 24fe7c40fc Merge pull request 'Utworzono klasy Roslina oraz Stan.' (#8) from roslina&stan into ram s481834 2024-03-23 16:37:11 +0100
  • fea90a983d Utworzono klasy Roslina oraz Stan. #8 roslina&stan Mateusz Czajka 2024-03-23 16:22:13 +0100
  • 47a43c5599 Merge pull request 'cleaning' (#7) from cleaning into ram s481825 2024-03-23 14:47:00 +0100
  • e3b8f1c84c Removed unused variable condition from class slot #7 cleaning jakzar 2024-03-23 14:30:36 +0100
  • 8d1d176d5b Added function to quickly return scaled desired plant image. jakzar 2024-03-23 13:59:24 +0100