Results resolved. Small ADjustments

This commit is contained in:
Steffen Illium
2023-11-16 15:29:07 +01:00
parent cb76972a5f
commit c3c434a97e
17 changed files with 236 additions and 93 deletions

View File

@ -1,4 +1,4 @@
from .actions import BtryCharge
from .actions import Charge
from .entitites import ChargePod, Battery
from .groups import ChargePods, Batteries
from .rules import DoneAtBatteryDischarge, BatteryDecharge

View File

@ -8,10 +8,10 @@ from marl_factory_grid.environment import constants as c
from marl_factory_grid.utils import helpers as h
class BtryCharge(Action):
class Charge(Action):
def __init__(self):
super().__init__(b.ACTION_CHARGE)
super().__init__(b.ACTION_CHARGE, b.REWARD_CHARGE_VALID, b.Reward_CHARGE_FAIL)
def do(self, entity, state) -> Union[None, ActionResult]:
if charge_pod := h.get_first(state[b.CHARGE_PODS].by_pos(entity.pos)):
@ -24,5 +24,4 @@ class BtryCharge(Action):
valid = c.NOT_VALID
state.print(f'{entity.name} failed to charged batteries at {entity.pos}.')
return ActionResult(entity=entity, identifier=self._identifier, validity=valid,
reward=b.REWARD_CHARGE_VALID if valid else b.Reward_CHARGE_FAIL)
return self.get_result(valid, entity)