Machines

marl_factory_grid/modules/batteries/__init__.py

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

marl_factory_grid/modules/batteries/groups.py

@@ -13,18 +13,13 @@ class Batteries(HasBoundedMixin, EnvObjects):
     def obs_tag(self):
         return self.__class__.__name__
 
-    @property
-    def obs_pairs(self):
-        return [(x.name, x) for x in self]
-
     def __init__(self, *args, **kwargs):
         super(Batteries, self).__init__(*args, **kwargs)
 
-    def spawn_batteries(self, agents, initial_charge_level):
+    def spawn(self, agents, initial_charge_level):
         batteries = [self._entity(initial_charge_level, agent) for _, agent in enumerate(agents)]
         self.add_items(batteries)
 
-
 class ChargePods(PositionMixin, EnvObjects):
 
     _entity = ChargePod

marl_factory_grid/modules/batteries/rules.py

@@ -13,8 +13,8 @@ class Btry(Rule):
         self.per_action_costs = per_action_costs
         self.initial_charge = initial_charge
 
-    def on_init(self, state):
-        state[b.BATTERIES].spawn_batteries(state[c.AGENT], self.initial_charge)
+    def on_init(self, state, lvl_map):
+        state[b.BATTERIES].spawn(state[c.AGENT], self.initial_charge)
 
     def tick_pre_step(self, state) -> List[TickResult]:
         pass