Commit Graph

473 Commits

Author SHA1 Message Date
95749d8238 added list of maps that require masking (in factory) 2024-09-30 10:09:47 +02:00
2eee415015 updated remaining configs from dirt to coins 2024-09-25 18:22:21 +02:00
5476f617c6 added changes from code submission branch and coin entity 2024-09-06 11:01:42 +02:00
33e40deecf Reset tsp route caching 2024-05-24 16:18:50 +02:00
98113ea849 Render all spawnpoints that are matched with a target dirt pile + Fixed arrow placement 2024-05-24 14:06:34 +02:00
defbaf6f93 Merge remote-tracking branch 'origin/marl_refactor' into marl_refactor
# Conflicts:
#	marl_factory_grid/algorithms/static/TSP_base_agent.py
#	marl_factory_grid/utils/plotting/plot_single_runs.py
#	marl_factory_grid/utils/renderer.py
#	test_run.py
2024-05-24 08:38:12 +02:00
37379d434e centered the arrows and text for better readability in plt action maps and added colored arrow assets 2024-05-22 12:34:53 +02:00
83f0c70cfb added plotting probability maps 2024-05-22 12:34:50 +02:00
3f88c4ee74 cleanup 2024-05-22 12:34:46 +02:00
0295af34b1 fixed coordinate mismatch in route plotting and added assets for actions 2024-05-22 12:34:32 +02:00
0d5b20a16f Adapted commit: "started visualization of routes in plot single runs, assets missing." 2024-05-22 12:34:06 +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
cb990445ce levelparser doesnt throw an error but instead prints a warning when no doors are found in the lvl file. 2024-05-13 11:52:21 +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
5e9e59c843 Added code for tsp_runs + Updated eval configs so that every episode only takes a maximum number of steps 2024-05-10 17:38:34 +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
28094bf4ce centered the arrows and text for better readability in plt action maps and added colored arrow assets 2024-05-10 10:25:35 +02:00
0e09094f97 added plotting probability maps 2024-05-08 14:27:08 +02:00
39b123221b cleanup 2024-05-06 19:30:27 +02:00
865669055d fixed coordinate mismatch in route plotting and added assets for actions 2024-05-06 13:55:47 +02:00
89ce723690 Fixed gitignore ignoring study_out base folder 2024-05-06 12:48:07 +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
175a02f997 Add various RL adapted configs part 2 2024-05-02 11:01:20 +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
63bed3f4ba Include modified version of two_rooms_one_door_config + small changes on two other configs and a rl study file 2024-03-27 17:06:23 +01:00
086a921929 Adapt base_ac.py and utils.py to be compatible with refactored environment 2024-03-27 17:04:14 +01:00
1e4ec254f4 added simple_crossing scenario 2024-03-25 13:08:37 +01:00
955598a129 fixed globalpos and 2rooms1door destination spawning 2024-03-25 12:30:31 +01:00
ce7f5cb1ea fixed merge-issue 2024-03-21 15:09:37 +01:00
c510610e50 Merge remote-tracking branch 'origin/unit_testing' into unit_testing 2024-03-21 15:05:57 +01:00
9049363a40 cleaned up and fixed tests. should all run now. 2024-03-21 15:04:29 +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
fa1f8bec21 Merge branch 'documentation' into 'main'
added documentation to monitor, recorder, plotter. can now merge

See merge request mobile-ifi/fiks/EDYS!6
2024-03-15 16:20:23 +01:00
6c21debac1 Merge remote-tracking branch 'origin/documentation' into documentation 2024-03-11 09:40:23 +01:00
b959bdd68e added documentation to plotting methods and added info about monitoring, recording, plotting to usage.rst 2024-03-11 09:38:23 +01:00
6a684dbc6d fix init 2024-02-22 12:44:43 +01:00