New Szenario "Two_Rooms_One_Door"

marl_factory_grid/modules/batteries/__init__.py

@@ -1,4 +1,4 @@
 from .actions import BtryCharge
-from .entitites import ChargePod, Battery
+from .entitites import Pod, Battery
 from .groups import ChargePods, Batteries
 from .rules import BtryDoneAtDischarge, Btry

marl_factory_grid/modules/batteries/constants.py

@@ -8,12 +8,3 @@ CHARGE_POD_SYMBOL    = 1
 
 
 CHARGE              = 'do_charge_action'
-
-
-class BatteryProperties(NamedTuple):
-    initial_charge: float = 0.8             #
-    charge_rate: float = 0.4                #
-    charge_locations: int = 20               #
-    per_action_costs: Union[dict, float] = 0.02
-    done_when_discharged: bool = False
-    multi_charge: bool = False

marl_factory_grid/modules/batteries/entitites.py

@@ -42,16 +42,16 @@ class Battery(BoundEntityMixin, EnvObject):
         else:
             return c.NOT_VALID
 
-    def summarize_state(self, **_):
-        attr_dict = {key: str(val) for key, val in self.__dict__.items() if not key.startswith('_') and key != 'data'}
-        attr_dict.update(dict(name=self.name, belongs_to=self._bound_entity.name))
-        return attr_dict
+    def summarize_state(self):
+        summary = super().summarize_state()
+        summary.update(dict(belongs_to=self._bound_entity.name, chargeLevel=self.charge_level))
+        return summary
 
     def render(self):
         return None
 
 
-class ChargePod(Entity):
+class Pod(Entity):
 
     @property
     def encoding(self):
@@ -59,7 +59,7 @@ class ChargePod(Entity):
 
     def __init__(self, *args, charge_rate: float = 0.4,
                  multi_charge: bool = False, **kwargs):
-        super(ChargePod, self).__init__(*args, **kwargs)
+        super(Pod, self).__init__(*args, **kwargs)
         self.charge_rate = charge_rate
         self.multi_charge = multi_charge
 
@@ -73,3 +73,8 @@ class ChargePod(Entity):
 
     def render(self):
         return RenderEntity(b.CHARGE_PODS, self.pos)
+
+    def summarize_state(self) -> dict:
+        summery = super().summarize_state()
+        summery.update(charge_rate=self.charge_rate)
+        return summery

marl_factory_grid/modules/batteries/groups.py

@@ -1,6 +1,6 @@
 from marl_factory_grid.environment.groups.env_objects import EnvObjects
 from marl_factory_grid.environment.groups.mixins import PositionMixin, HasBoundMixin
-from marl_factory_grid.modules.batteries.entitites import ChargePod, Battery
+from marl_factory_grid.modules.batteries.entitites import Pod, Battery
 
 
 class Batteries(HasBoundMixin, EnvObjects):
@@ -20,9 +20,10 @@ class Batteries(HasBoundMixin, EnvObjects):
         batteries = [self._entity(initial_charge_level, agent) for _, agent in enumerate(agents)]
         self.add_items(batteries)
 
+
 class ChargePods(PositionMixin, EnvObjects):
 
-    _entity = ChargePod
+    _entity = Pod
 
     def __init__(self, *args, **kwargs):
         super(ChargePods, self).__init__(*args, **kwargs)

marl_factory_grid/modules/batteries/rules.py

@@ -59,3 +59,19 @@ class BtryDoneAtDischarge(Rule):
         else:
             return [DoneResult(self.name, validity=c.NOT_VALID, reward=0)]
 
+
+class PodRules(Rule):
+
+    def __init__(self, n_pods: int, charge_rate: float = 0.4, multi_charge: bool = False):
+        super().__init__()
+        self.multi_charge = multi_charge
+        self.charge_rate = charge_rate
+        self.n_pods = n_pods
+
+    def on_init(self, state, lvl_map):
+        pod_collection = state[b.CHARGE_PODS]
+        empty_tiles = state[c.FLOOR].empty_tiles[:self.n_pods]
+        pods = pod_collection.from_tiles(empty_tiles, entity_kwargs=dict(
+            multi_charge=self.multi_charge, charge_rate=self.charge_rate)
+                                         )
+        pod_collection.add_items(pods)