steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-07-11 23:42:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Equalize rendering for TSP and RL agents

Browse Source
This commit is contained in:
Julian Schönberger
2024-05-24 18:54:38 +02:00
parent c8336e8f78
commit 6e6ce9dc5d
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
marl_factory_grid/algorithms/marl/a2c_dirt.py
View File

@ -286,6 +286,7 @@ class A2C:
updated_indices = []
if len(affected_agents[door_positions[0]]) == 0:
# Remove auxiliary piles for all agents
# (In config, we defined every pile with an even numbered index to be an auxiliary pile)
updated_indices = [[ele for ele in lst if ele % 2 != 0] for lst in indices]
else:
for distance, agent_indices in affected_agents[door_positions[0]].items():
@ -430,6 +431,10 @@ class A2C:
reward[idx] += 50 # 1
cleaned_dirt_piles[idx][pos] = True
# Indicate that renderer can hide dirt pile
dirt_at_position = env.state['DirtPiles'].by_pos(pos)
dirt_at_position[0].set_new_amount(0)
if self.cfg[nms.ALGORITHM]["pile_all_done"] in ["all", "distributed"]:
if all([all(cleaned_dirt_piles[i].values()) for i in range(self.n_agents)]):
done = True
@ -603,12 +608,17 @@ class A2C:
while episode < n_episodes:
obs = env.reset()
self.set_agent_spawnpoint(env)
if self.cfg[nms.ENV][nms.EVAL_RENDER]:
if self.cfg[nms.ENV]["save_and_log"] and self.cfg[nms.ENV]["record"]:
env.set_recorder(self.recorder)
if self.cfg[nms.ALGORITHM]["auxiliary_piles"]:
# Don't render auxiliary piles
auxiliary_piles = [pile for idx, pile in enumerate(env.state.entities['DirtPiles']) if idx % 2 == 0]
for pile in auxiliary_piles:
pile.set_new_amount(0)
env.render()
env._renderer.fps = 5
self.set_agent_spawnpoint(env)
"""obs = list(obs.values())"""
# Reset current target pile at episode begin if all piles have to be cleaned in one episode
if self.cfg[nms.ALGORITHM]["pile_all_done"] in ["all", "distributed", "shared"]:

6
marl_factory_grid/algorithms/static/TSP_dirt_agent.py
View File

@ -24,9 +24,9 @@ class TSPDirtAgent(TSPBaseAgent):
"""
dirt_at_position = self._env.state[di.DIRT].by_pos(self.state.pos)
if dirt_at_position:
# Translate the action_object to an integer to have the same output as any other model
action = di.CLEAN_UP
elif door := self._door_is_close(self._env.state):
# Remove dirt from map
self._env.state[di.DIRT].delete_env_object(dirt_at_position[0])
if door := self._door_is_close(self._env.state):
action = self._use_door_or_move(door, di.DIRT)
else:
action = self._predict_move(di.DIRT)