Commit Graph

111 Commits

Author SHA1 Message Date
1bc8a26bd2 Merge branch 'genetic_algorithm' 2022-06-10 11:14:53 +02:00
80e497cc59 Finished TSP, cleaning, refactoring whole project 2022-06-10 11:11:31 +02:00
f55886a199 Merge branch 'genetic_algorithm' of https://git.wmi.amu.edu.pl/s462072/Trashmaster into genetic_algorithm 2022-06-10 11:02:07 +02:00
8e5f744290 map resolved, trashbin updated 2022-06-10 11:00:17 +02:00
a16ec52642 TSP v5 2022-06-10 10:53:42 +02:00
trzmielewskiR
65f469465a tsp v4.1a, getting distance from astar not from pythagoras 2022-06-10 04:21:42 +02:00
Kacper
75746f077e tsp v4.1 2022-06-10 03:26:48 +02:00
Kacper
2908d62fb3 tsp v4 2022-06-10 03:16:43 +02:00
Kacper
d7c2e446a3 tsp v3.2 2022-06-10 02:16:56 +02:00
Kacper
4a5676884c tsp v3.1 2022-06-10 02:13:53 +02:00
Kacper
b1d2d04448 tsp v3 2022-06-10 02:12:10 +02:00
Kacper
005255ee9b tsp v2 2022-06-10 01:14:08 +02:00
4309525ed4 Merge pull request 'updated main, repaired astar, added method for get actions from coords, expected to be used in GA' (#31) from astar_fix into master
Reviewed-on: #31
2022-06-10 01:12:23 +02:00
trzmielewskiR
fc16e616d4 updated main, repaired astar, added method for get actions from coords, expected to be used in GA 2022-06-10 01:06:03 +02:00
Kacper
316615dec6 TSP v1 2022-06-09 23:53:44 +02:00
5f324d82dc Merge pull request 'hotfix/netural_network' (#30) from hotfix/netural_network into master
Reviewed-on: #30
2022-06-09 23:01:43 +02:00
Kacper
9075e96d83 hudv1 2022-06-09 21:55:35 +02:00
czorekk
3182e09e9d [hotfix/neural_network] added neural network recognize result viewer in game 2022-05-27 10:06:24 +02:00
czorekk
9d3e744218 [hotifx/neural_network] some changes, gpu calculation 2022-05-27 09:22:49 +02:00
be7be08a7f Merge pull request 'hotfix/netural_network' (#29) from hotfix/netural_network into master
Reviewed-on: #29
2022-05-26 21:48:28 +02:00
happy531
1002440947 add simple NN test 2022-05-26 20:55:42 +02:00
happy531
49db999cc9 repair getPrediction 2022-05-26 20:55:34 +02:00
happy531
134e45de18 add trained NN on 10 epoch 2022-05-26 20:55:18 +02:00
aliaksei-kudravets
5c4a536c5a add backpropTrainer model with controled data set 2022-05-26 11:08:48 +02:00
c51dbb766a Merge pull request 'garbage_recognition' (#27) from garbage_recognition into master
Reviewed-on: #27
2022-05-26 10:26:47 +02:00
happy531
8029b42ed3 add getPrediction function 2022-05-23 20:20:15 +02:00
happy531
d65d632c62 add train neural network script 2022-05-23 20:19:53 +02:00
happy531
aa386236b1 add Neural Network model 2022-05-23 20:19:19 +02:00
happy531
b466873e89 update dataset 2022-05-23 20:19:01 +02:00
happy531
33c356822b add testing garbage images 2022-05-22 15:34:49 +02:00
happy531
408af58284 add dataset for garbage classification 2022-05-22 13:40:59 +02:00
776b8aa3b6 fix trashbin driving from point to point 2022-05-13 13:12:56 +02:00
5ab9a3c30c Merge pull request 'fix path' (#26) from decision_tree_trashbins into master
Reviewed-on: #26
2022-05-13 12:47:36 +02:00
aliaksei-kudravets
f258750c1c fix path 2022-05-13 12:47:08 +02:00
c6cbb587cd Merge pull request 'add decision tree model to trashbins, which are generated on map' (#25) from decision_tree_trashbins into master
Reviewed-on: #25
2022-05-13 12:16:09 +02:00
aliaksei-kudravets
ed19e41bc6 add decision tree model to trashbins, which are generated on map 2022-05-13 08:31:40 +02:00
trzmielewskiR
7add741845 Repaired prediction, changed dataset 2022-05-12 09:39:25 +02:00
42d09e21f8 Merge pull request 'Dodanie drzewa decyzjnego v1' (#24) from decisionTree into master
Reviewed-on: #24
2022-05-10 12:14:51 +02:00
8d563da40d Merge pull request 'trashbin-rendering' (#23) from trashbin-rendering into master
Reviewed-on: #23
2022-05-10 12:08:34 +02:00
czorekk
45a3ff6711 [trashbin-rendering] deleted unused file 'camera', little change in a* about tiles processing 2022-05-10 01:06:39 +02:00
czorekk
1971d4104d [trashbin-rendering] added trash bin rendering, added patterns, sprite group and part in map generator 2022-05-10 01:05:34 +02:00
czorekk
36b804a7f0 [trashbin-rendering] added trash bin sprites 2022-05-10 01:03:53 +02:00
trzmielewskiR
8e331a8803 Dodanie drzewa decyzjnego v1 2022-05-09 19:18:24 +02:00
0f090f9a85 Merge pull request 'integrate_a_star_and_movement' (#22) from integrate_a_star_and_movement into master
Reviewed-on: #22
2022-05-06 13:10:06 +02:00
aliaksei-kudravets
29a11547f4 a star1.0 2022-05-06 12:27:18 +02:00
czorekk
37375d4f1d [integrate_a_star_and_movement] little fixes 2022-04-29 11:01:16 +02:00
czorekk
e6448b61cd [integrate_a_star_and_movement] added camera position fix 2022-04-28 21:28:03 +02:00
czorekk
ffffa3a308 init 2022-04-28 20:12:46 +02:00
ab4b404ba4 delete angle property 2022-04-28 18:43:15 +02:00
eec3b64849 integrate movement and a* 2022-04-28 17:21:35 +02:00