Commit Graph

38 Commits

Author SHA1 Message Date
c8336e8f78 Reset tsp route caching + renamed and moved configs + removed unnecessary files 2024-05-24 16:12:05 +02:00
c7f2bbfbac Merge remote-tracking branch 'origin/marl_refactor' into marl_refactor 2024-05-21 11:40:22 +02:00
13ea9d25c9 Merge remote-tracking branch 'origin/rl_plotting' into marl_refactor 2024-05-21 11:39:51 +02:00
4571dc1cd1 Added shared piles option to dirt_quadrant eval + Changed dirt_quadrant layout and adapted configs 2024-05-17 17:52:52 +02:00
1a8ca9110b added rendering of start and target pos. changed file save location to match current run in study out 2024-05-16 13:16:53 +02:00
f8aa4e0c03 merged RL agent with action map plotting and added it to end of agents train loop 2024-05-12 11:48:05 +02:00
d0d31b964c Added 'shared' dirt piles option for eval + Fixed usage of renderer + Added recorder option 2024-05-10 14:54:00 +02:00
5c5a09be3f Merge branch 'route_plotting' into rl_plotting 2024-05-10 12:48:06 +02:00
a25b04e092 Included method to tackle emergence in two_rooms_one_door_modified + Better access of different settings in marl_adapted + Added and modified a lot of config files 2024-05-10 11:57:26 +02:00
3c54d04f9f All relevant functional code for A2C Dirt Quadrant setting with small changes to the environment + Different configs for single agent and multiagent settings 2024-05-06 12:33:37 +02:00
9f2cb103f4 started visualization of routes in plot single runs, assets missing. 2024-05-02 17:07:33 +02:00
55026eda12 Add Independent A2C implementation 2024-05-02 11:10:23 +02:00
c7c2c4e5a3 Add various RL adapted configs 2024-05-02 11:00:35 +02:00
48d708bbcd environment code changes for RL settings 2024-05-02 10:54:46 +02:00
5ee39eba8d added fallback action attribute to agents and set standard fallback action to noop 2024-04-29 11:03:59 +02:00
0bbf0dafdb Moved route caching to env level and removed print statements 2024-04-28 13:52:39 +02:00
50bcf5d995 Merge branch 'unit_testing' into marl_refactor 2024-04-19 09:46:46 +02:00
54d4e1ecb5 added simple route caching and fixed move 4 point graph in tspbaseagent 2024-04-17 15:28:10 +02:00
fe5a97a413 added allowed direction check for predict move 2024-04-04 12:48:14 +02:00
086a921929 Adapt base_ac.py and utils.py to be compatible with refactored environment 2024-03-27 17:04:14 +01:00
b3acb57b4e Merge branch 'main' into 'unit_testing'
# Conflicts:
#   marl_factory_grid/algorithms/static/TSP_dirt_agent.py
#   marl_factory_grid/utils/config_parser.py
2024-03-18 16:23:44 +01:00
18a30ed17a minor fixes 2024-03-18 11:31:02 +01:00
51612812b0 added target agent test and fixed tsp agents 2024-01-18 13:32:30 +01:00
3cd5caed93 added documentation for agents 2024-01-04 17:48:32 +01:00
e7933985cb spinx going book 2023-12-12 17:51:37 +01:00
fcea1972a4 Merge branch 'main' into unit_testing
# Conflicts:
#	marl_factory_grid/modules/doors/groups.py
#	marl_factory_grid/utils/states.py
2023-11-23 12:58:12 +01:00
4c85cac50f maintainer test grabs temp state 2023-11-23 12:52:27 +01:00
142bbb2c0c Changed Collision Check 2023-11-23 11:07:16 +01:00
c3c434a97e Results resolved. Small ADjustments 2023-11-16 15:29:07 +01:00
9b289591ba Maintainer and pos_dicts fixed. Are sets now. 2023-11-10 14:16:48 +01:00
6711a0976b Resolved some warnings and style issues 2023-11-10 09:29:54 +01:00
06a5130b25 new rules, new spawn logic, small fixes, default and narrow corridor debugged 2023-11-09 17:50:20 +01:00
7a1d3f84f1 no more tiles no more floor 2023-10-20 14:36:23 +02:00
8709b093b8 Merge branch 'remove-tiles'
# Conflicts:
#	marl_factory_grid/environment/actions.py
#	marl_factory_grid/environment/entity/entity.py
#	marl_factory_grid/environment/factory.py
#	marl_factory_grid/modules/batteries/rules.py
#	marl_factory_grid/modules/clean_up/groups.py
#	marl_factory_grid/modules/destinations/entitites.py
#	marl_factory_grid/modules/destinations/groups.py
#	marl_factory_grid/modules/destinations/rules.py
#	marl_factory_grid/modules/items/rules.py
#	marl_factory_grid/modules/maintenance/entities.py
#	marl_factory_grid/utils/config_parser.py
#	marl_factory_grid/utils/level_parser.py
#	marl_factory_grid/utils/states.py
2023-10-17 14:03:59 +02:00
3677b7b7dc WIP: removing tiles 2023-10-16 11:06:51 +02:00
e326a95bf4 Redone the spawn procedute and destination objects 2023-10-11 16:36:48 +02:00
836495a884 Machines 2023-07-06 12:01:25 +02:00
d11b1a8172 renaming 2023-06-21 11:28:36 +02:00