Commit Graph

127 Commits

Author SHA1 Message Date
120cc7489e Merge branch 'master' into genetic_algorithm 2021-06-17 12:04:08 +02:00
26aba4eae9 Merge remote-tracking branch 'origin/master' 2021-06-17 11:58:41 +02:00
279044cc98 changed disarming labels (cable -> wire) 2021-06-17 11:55:46 +02:00
2342aac262 Added genetic_algorithm.py file which implements genetic algorithm 2021-06-16 23:24:41 +02:00
39dbd5a5aa added 'button_genetic_algorithm' button 2021-06-16 13:57:15 +02:00
8f85934095 fixed: always positive outcome; added: 3 new wire colors 2021-06-07 09:40:38 +02:00
s452635
2daf6a2f6b tweaked disarm popup, mainly fixed picture blitting 2021-06-07 02:59:04 +02:00
70fb44f69e implemented new disarming in auto mode 2021-06-06 22:00:42 +02:00
985c7c0d77 post-merge cleanup 2021-06-06 19:00:20 +02:00
bec9e14c93 decision tree cleanup 2021-06-06 18:47:06 +02:00
5ab0f21a84 Merge branch 'master' into neural_networks
# Conflicts:
#	.gitignore
#	algorithms/learn/decision_tree/decision_tree.py
2021-06-06 18:33:48 +02:00
7a5ce8d1cd disabled tree plotting; added tree files to .gitignore 2021-06-06 18:29:02 +02:00
s452635
e84e71529f disarming popup 2021-06-06 15:51:08 +02:00
d7a552194f universalised NN class; build series-type NN 2021-06-06 09:11:06 +02:00
2fc525ad52 added neural network class; made necessary changes to project structure 2021-06-05 00:02:14 +02:00
9a910a9284 big commit (ostroznie!) 2021-05-26 13:47:02 +02:00
32c50f27fc changed some data regarding decision_tree's; changed map a bit 2021-05-24 01:05:00 +02:00
f6ff6e548c coordinated all changes regarding decision_tree functionality 2021-05-23 20:20:02 +02:00
9b20be5248 merged master to decision_trees 2021-05-23 18:04:44 +02:00
fa249cf484 improved generate_data() method in parameter_json.py to not generate duplicates 2021-05-23 17:00:07 +02:00
c7845a0d1f created first Decision Tree; minor changes to project structure 2021-05-23 13:38:16 +02:00
s452635
f03899b535 mine_parameters and a json sample param file generator 2021-05-23 11:43:31 +02:00
439e27625c Merge branch 'autonomic_stroll' 2021-05-23 08:48:29 +02:00
cfe686ca24 implemented auto-mode 2021-05-23 08:43:31 +02:00
90e9dcd6ff Merge branch 'master' into autonomic_stroll
# Conflicts:
#	main.py
#	minefield.py
2021-05-23 06:50:59 +02:00
s452635
7ef7c24339 created a package for objects, changed ui into a package 2021-05-23 06:14:12 +02:00
s452635
b6fa5844fa Merge remote-tracking branch 'origin/master' 2021-05-23 05:51:31 +02:00
s452635
bbc7f92201 created package for assets, minor changes to mine assets 2021-05-23 05:51:17 +02:00
s452635
07934fb15c created package for assets, minor changes to mine assets 2021-05-23 05:50:49 +02:00
853eddcadd minor refactors 2021-05-23 00:09:02 +02:00
ad5864c7f8 Merge branch 'master' into decision_trees
# Conflicts:
#	main.py
2021-05-22 23:57:48 +02:00
1f71b29604 added decision tree generator scaffolding 2021-05-22 23:54:46 +02:00
dd024fa404 added Game class; code rework in main; adjusted some classes; minor improvments in InputBox 2021-05-21 14:08:45 +02:00
9755ddc96d Dodanie fukncji rozbrajania min w klasie minefield. 2021-05-20 15:01:09 +02:00
096d506553 added hash function and hash enums 2021-05-20 00:44:06 +02:00
3c263e57e7 implemented setting random mines as targets 2021-05-19 23:44:56 +02:00
7fe9e0958c diversified agents speed on different terrain types; temporarily disabled GameOver screen 2021-05-18 20:37:31 +02:00
9918bf64d8 merged GameOverScreen branch 2021-05-18 19:46:04 +02:00
Tomek Sidoruk
cc7c556d0c
add time mine explosion detection and game over screen 2021-05-16 17:34:05 +02:00
af238a6ed6 added agent movement animations; redefined game loop; added turn counting; adjusted classes; fixed a bug; code refactoring 2021-05-12 14:33:26 +02:00
0fc5cedae6 redesigned in-game gui; added UiComponentsList class; added goal highlighting; fixed some bugs; code refactoring 2021-05-11 20:30:01 +02:00
346fe641d4 fixed a_star (new priority bug) 2021-05-09 19:39:00 +02:00
cf4b3f9027 map and cost adjustments 2021-05-09 18:38:52 +02:00
03b17f293f final a_star adjustments 2021-05-09 17:55:42 +02:00
36258b11d0 Fixed cost and priority calculation 2021-05-09 02:06:13 +02:00
7d16dcc616 Merge branch 'master' into a_star
# Conflicts:
#	main.py
2021-05-09 01:17:09 +02:00
8ffdacd603 coordinated project modules; fully implemented blitting using display_assets.py; updated maps; fixed some bugs 2021-05-07 22:26:58 +02:00
Jakub Danilewicz
e7270b8c3a Merge branch 'master' of https://git.wmi.amu.edu.pl/s452711/Projekt_Sztuczna_Inteligencja 2021-05-07 20:05:12 +02:00
Jakub Danilewicz
436a155b7e Dodany Enum Terrain; Dodany koszt na Tile; Używana jest nowa mapa testowa (reskin secondmap) 2021-05-07 19:58:16 +02:00
Jakub Danilewicz
f82d6657ef Dodany Enum Terrain; Dodany koszt na Tile; Używana jest nowa mapa testowa (reskin secondmap) 2021-05-07 19:02:09 +02:00