Merge branch 'main' into unit_testing

This commit is contained in:
Chanumask
2023-11-16 19:45:52 +01:00
27 changed files with 290 additions and 126 deletions

View File

@@ -11,7 +11,7 @@ from marl_factory_grid.environment import constants as c
class DestAction(Action):
def __init__(self):
super().__init__(d.DESTINATION)
super().__init__(d.DESTINATION, d.REWARD_WAIT_VALID, d.REWARD_WAIT_FAIL)
def do(self, entity, state) -> Union[None, ActionResult]:
if destination := state[d.DESTINATION].by_pos(entity.pos):
@@ -19,6 +19,5 @@ class DestAction(Action):
state.print(f'{entity.name} just waited at {entity.pos}')
else:
valid = c.NOT_VALID
state.print(f'{entity.name} just tried to do_wait_action do_wait_action at {entity.pos} but failed')
return ActionResult(entity=entity, identifier=self._identifier, validity=valid,
reward=d.REWARD_WAIT_VALID if valid else d.REWARD_WAIT_FAIL)
state.print(f'{entity.name} just tried to "do_wait_action" at {entity.pos} but failed')
return self.get_result(valid, entity)