Commit Graph

118 Commits

Author SHA1 Message Date
99c709d271 Merge pull request 'Merge genetic_algorithms with final_show branch' (#28) from final_show into genetic_algorithms
Reviewed-on: #28
2024-06-09 18:40:24 +02:00
b78f7f5ee7 Merge pull request 'Merge genetic2 to final_show' (#27) from genetic2 into final_show
Reviewed-on: #27
2024-06-09 18:39:27 +02:00
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 2024-06-09 18:33:50 +02:00
d61b585827 Corrected GeneticAlgorithm2 and made a GeneticAlgorithm3 and generated fields using them. Made GeneticAccuracy to check the performance of the algorithms. 2024-06-08 23:25:08 +02:00
6c86eebd89 genetic algorithm 2 with a value of None 2024-06-07 18:41:55 +02:00
da1bfe1d8f This: -changed readme.txt 2024-06-07 15:29:26 +02:00
4339284c4b This: -changed label for decision -changed goaltressure for BFS3 2024-06-07 15:01:15 +02:00
tafit0902
51a5b13669 ladowanie pola z pliku GA, rozpoznawanie zdjec na polu, decyzja o podlaniu 2024-06-07 00:02:36 +02:00
0becd1b1f6 Made genetic algorithm and made a field using it. 2024-06-06 08:35:36 +02:00
eb9744f52f Merge pull request 'refactor' (#26) from refactor into master
Reviewed-on: #26
2024-06-04 13:25:07 +02:00
ea6a9f5204 Merge pull request 'neural_network' (#25) from neural_network into refactor
Reviewed-on: #25
2024-06-04 13:23:15 +02:00
7a3c30bd2f Added some trained models. 2024-06-04 13:18:15 +02:00
53ec8e993e Merge pull request 'Merge with model for 2 crops only' (#23) from neural_network_two_crops into neural_network
Reviewed-on: #23
2024-06-04 12:45:15 +02:00
24724fb8b7 This: -added trained model for 2 crops -added way to choose which model should we use 2024-06-04 12:40:39 +02:00
16302f4d6c Merge pull request 'Merge old branches to refactor due to merge it with master' (#22) from tree into refactor
Reviewed-on: #22
2024-06-04 11:36:13 +02:00
6959afe81a Merge pull request 'This: -small refactor in print' (#21) from tree_tractor_move into tree
Reviewed-on: #21
2024-06-04 11:32:36 +02:00
58e958ac44 This: -small refactor in print 2024-06-04 11:32:07 +02:00
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 2024-05-27 09:01:51 +02:00
ccd1cb2359 Trained the model. 2024-05-26 18:41:55 +02:00
5d7b68fdd6 This: -removed model.pth from git tracking for now -added corn to dataset 2024-05-26 14:46:12 +02:00
34bfe78218 This: -fixed line where device for training was always cuda device 2024-05-26 14:39:05 +02:00
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 2024-05-26 13:58:48 +02:00
tafit0902
d2abac6ebd roslina umiera po zlym nawiezieniu 2024-05-26 01:55:40 +02:00
tafit0902
de0740d34b losowanie bez powtorzen, poprawki w wyswieltaniu konsoli 2024-05-26 01:37:01 +02:00
tafit0902
3c6e79a1fd losowanie zdjecia dla slotu, poruszanie sie traktora, uzycie sieci 2024-05-26 01:08:47 +02:00
tafit0902
f38a52e135 dodanie podstaw sieci nuronowej 2024-05-25 02:00:19 +02:00
971746a0f8 This: -improved quality of tree visualization -fixed a bug where season cycle was not working properly 2024-05-12 22:53:41 +02:00
afae656d76 dodatkowe dane 2024-05-12 21:39:01 +02:00
9ebac46bef This: -fixed a bug where tractor_water_level and move delay was called in wrong place 2024-05-12 17:34:27 +02:00
0b494d694d This: -removed unused move in tree_move -changed display to table form in terminal -small refactoring due to code clean 2024-05-12 14:59:23 +02:00
3713ccc8ff This: -made graph bigger 2024-05-12 13:58:57 +02:00
tafit0902
7a14a94b1e traktor porusza sie po polu i decyduje czy podlac na podstawie drzewa decyzyjnego 2024-05-11 22:05:02 +02:00
7c7a485d6b Made an algorithm to generate data (treeData.py) 2024-05-11 18:30:14 +02:00
d2d7a98a84 This: -changed decision from int to string values 2024-05-11 14:30:29 +02:00
b377c5ea24 This: -added tree.png to .gitignore to prevent mistakes 2024-05-11 14:21:26 +02:00
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 2024-05-11 14:18:40 +02:00
48b159ae02 This: -switched diseases from string to int values 2024-05-11 13:31:06 +02:00
de69592612 This: -turned off gas station drawing 2024-05-11 13:25:36 +02:00
51fe19a071 This: -switched data for tree from strings to int -broke weather atributte to temperature and rain -added waterLevel for tractor 2024-05-11 13:24:09 +02:00
f8a3156678 This: -renamed tree.py to Drzewo.py -added dataTree.csv -added basic function connected to decision tree -added required packages to readme.txt 2024-05-10 19:41:13 +02:00
e6c86e7856 This: -added readme file 2024-05-10 18:39:26 +02:00
01a3d1864b This: -added Tree.py 2024-05-10 18:34:52 +02:00
feeca26892 This: -added weather cycle 2024-05-10 18:33:38 +02:00
2b3170d10c This: -refactor few lines to disable Astar related functions and behaviour 2024-05-10 17:47:05 +02:00
d0e8a47da1 Merge pull request 'astar_temp' (#19) from astar_temp into master
Reviewed-on: #19
2024-05-10 17:34:47 +02:00
d150e9c21d Made function to test speed of A*.
Changed heuristic2.
2024-04-29 14:05:26 +02:00
c0fe5766b0 fix: brakowalo total_cost przy wylowywaniu A_star2 w App.py 2024-04-28 13:17:08 +02:00
92c893c917 This: -added road.jpg 2024-04-28 12:59:28 +02:00
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
e448c80739 This: -simplified cost taking for A* 2024-04-28 11:51:47 +02:00