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
This commit is contained in:
Chanumask
2024-05-24 08:38:12 +02:00
4 changed files with 2 additions and 5 deletions

View File

@ -1,5 +1,3 @@
import json
import os
import pickle
from os import PathLike
from pathlib import Path

View File

@ -93,4 +93,4 @@ def two_rooms_one_door_modified_multi_agent_eval(emergent_phenomenon):
if __name__ == '__main__':
dirt_quadrant_single_agent_training()
dirt_quadrant_5_multi_agent_ctde_eval(True)

View File

@ -104,4 +104,4 @@ def two_rooms_one_door_modified_multi_agent_tsp(emergent_phenomenon):
if __name__ == '__main__':
dirt_quadrant_multi_agent_tsp(False)
two_rooms_one_door_modified_multi_agent_tsp(False)

View File

@ -31,7 +31,6 @@ if __name__ == '__main__':
action_spaces = factory.action_space
# agents = [TSPDirtAgent(factory, 0), TSPItemAgent(factory, 1), TSPTargetAgent(factory, 2)]
agents = [TSPTargetAgent(factory, 0), TSPTargetAgent(factory, 1)]
# agents = [TSPTargetAgent(factory, 0)]
while not done:
a = [x.predict() for x in agents]
obs_type, _, _, done, info = factory.step(a)