new rules, new spawn logic, small fixes, default and narrow corridor debugged

marl_factory_grid/modules/batteries/groups.py

@@ -1,52 +1,36 @@
 from typing import Union, List, Tuple
 
+from marl_factory_grid.environment import constants as c
 from marl_factory_grid.environment.groups.collection import Collection
-from marl_factory_grid.modules.batteries.entitites import Pod, Battery
+from marl_factory_grid.modules.batteries.entitites import ChargePod, Battery
+from marl_factory_grid.utils.results import Result
 
 
 class Batteries(Collection):
     _entity = Battery
 
-    @property
-    def var_is_blocking_light(self):
-        return False
-
-    @property
-    def var_can_collide(self):
-        return False
-
-    @property
-    def var_can_move(self):
-        return False
-
-    @property
-    def var_has_position(self):
-        return False
-
-    @property
-    def var_can_be_bound(self):
-        return True
+    var_has_position = False
+    var_can_be_bound = True
 
     @property
     def obs_tag(self):
         return self.__class__.__name__
 
-    def __init__(self, *args, **kwargs):
-        super(Batteries, self).__init__(*args, **kwargs)
+    def __init__(self, size, initial_charge_level: float=1.0, *args, **kwargs):
+        super(Batteries, self).__init__(size, *args, **kwargs)
+        self.initial_charge_level = initial_charge_level
 
-    def spawn(self, agents, initial_charge_level):
-        batteries = [self._entity(initial_charge_level, agent) for _, agent in enumerate(agents)]
+    def spawn(self, coords_or_quantity: Union[int, List[Tuple[(int, int)]]], agents, *entity_args, **entity_kwargs):
+        batteries = [self._entity(self.initial_charge_level, agent) for _, agent in enumerate(agents)]
         self.add_items(batteries)
 
-    # def spawn(self, coords_or_quantity: Union[int, List[Tuple[(int, int)]]], *entity_args):           hat keine pos
-    #     agents = entity_args[0]
-    #     initial_charge_level = entity_args[1]
-    #     batteries = [self._entity(initial_charge_level, agent) for _, agent in enumerate(agents)]
-    #     self.add_items(batteries)
+    def trigger_spawn(self, state, *entity_args, coords_or_quantity=None,  **entity_kwargs):
+        self.spawn(0, state[c.AGENT])
+        return Result(identifier=f'{self.name}_spawn', validity=c.VALID, value=len(self))
 
 
 class ChargePods(Collection):
-    _entity = Pod
+    _entity = ChargePod
 
     def __init__(self, *args, **kwargs):
         super(ChargePods, self).__init__(*args, **kwargs)