steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-06-24 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Battery Charge

Browse Source
This commit is contained in:
Steffen Illium
2023-11-16 17:16:22 +01:00
parent 6c27aa8eaf
commit 67a3f3f342
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
marl_factory_grid/modules/batteries/actions.py
View File

@ -15,7 +15,7 @@ class Charge(Action):
def do(self, entity, state) -> Union[None, ActionResult]: def do(self, entity, state) -> Union[None, ActionResult]:
if charge_pod := h.get_first(state[b.CHARGE_PODS].by_pos(entity.pos)): if charge_pod := h.get_first(state[b.CHARGE_PODS].by_pos(entity.pos)):
valid = h.get_first(charge_pod.charge_battery(state[b.BATTERIES].by_entity(entity))) valid = h.get_first(charge_pod.charge_battery(entity, state))
if valid: if valid:
state.print(f'{entity.name} just charged batteries at {charge_pod.name}.') state.print(f'{entity.name} just charged batteries at {charge_pod.name}.')
else: else:

9
marl_factory_grid/modules/batteries/entitites.py
View File

@ -1,4 +1,5 @@
from marl_factory_grid.environment import constants as c from marl_factory_grid.environment import constants as c
from marl_factory_grid.environment.entity.agent import Agent
from marl_factory_grid.environment.entity.entity import Entity from marl_factory_grid.environment.entity.entity import Entity
from marl_factory_grid.environment.entity.object import Object from marl_factory_grid.environment.entity.object import Object
from marl_factory_grid.modules.batteries import constants as b from marl_factory_grid.modules.batteries import constants as b
@ -62,11 +63,11 @@ class ChargePod(Entity):
self.charge_rate = charge_rate self.charge_rate = charge_rate
self.multi_charge = multi_charge self.multi_charge = multi_charge
def charge_battery(self, battery: Battery): def charge_battery(self, entity, state):
if battery.charge_level == 1.0: battery = state[b.BATTERIES].by_entity(entity)
if battery.charge_level >= 1.0:
return c.NOT_VALID return c.NOT_VALID
if sum(1 for key, val in self.state.entities.pos_dict[self.pos] for guest in val if if len([x for x in state[c.AGENT].by_pos(entity.pos)]) > 1:
'agent' in guest.name.lower()) > 1:
return c.NOT_VALID return c.NOT_VALID
valid = battery.do_charge_action(self.charge_rate) valid = battery.do_charge_action(self.charge_rate)
return valid return valid

3
marl_factory_grid/modules/maintenance/entities.py
View File

@ -26,10 +26,9 @@ class Maintainer(Entity):
self._last_serviced = 'None' self._last_serviced = 'None'
def tick(self, state): def tick(self, state):
self.clear_temp_state
if found_objective := h.get_first(state[self.objective].by_pos(self.pos)): if found_objective := h.get_first(state[self.objective].by_pos(self.pos)):
if found_objective.name != self._last_serviced: if found_objective.name != self._last_serviced:
self.action.do(self, state) result = self.action.do(self, state)
self._last_serviced = found_objective.name self._last_serviced = found_objective.name
else: else:
action = self.get_move_action(state) action = self.get_move_action(state)