New Szenario "Two_Rooms_One_Door"

marl_factory_grid/environment/groups/env_objects.py

@@ -23,9 +23,6 @@ class EnvObjects(Objects):
         super(EnvObjects, self).add_item(item)
         return self
 
-    def summarize_states(self):
-        return [entity.summarize_state() for entity in self.values()]
-
     def delete_env_object(self, env_object: EnvObject):
         del self[env_object.name]
 

marl_factory_grid/environment/groups/mixins.py

@@ -45,7 +45,8 @@ class PositionMixin:
     def by_pos(self, pos: (int, int)):
         pos = tuple(pos)
         try:
-            return next(e for e in self if e.pos == pos)
+            return self.pos_dict[pos]
+            # return next(e for e in self if e.pos == pos)
         except StopIteration:
             pass
         except ValueError:

marl_factory_grid/environment/groups/objects.py

@@ -144,7 +144,13 @@ class Objects:
 
     def notify_add_entity(self, entity: Object):
         try:
-            entity.add_observer(self)
+            if self not in entity.observers:
+                entity.add_observer(self)
             self.pos_dict[entity.pos].append(entity)
         except (ValueError, AttributeError):
             pass
+
+    def summarize_states(self):
+        # FIXME PROTOBUFF
+        #  return [e.summarize_state() for e in self]
+        return [e.summarize_state() for e in self]

marl_factory_grid/environment/groups/utils.py

@@ -43,38 +43,3 @@ class GlobalPositions(HasBoundMixin, EnvObjects):
 
     def __init__(self, *args, **kwargs):
         super(GlobalPositions, self).__init__(*args, **kwargs)
-
-
-class ZonesOLD(Objects):
-
-    _entity = Zone
-
-    @property
-    def accounting_zones(self):
-        return [self[idx] for idx, name in self.items() if name != c.DANGER_ZONE]
-
-    def __init__(self, parsed_level):
-        raise NotImplementedError('This needs a Rework')
-        super(Zones, self).__init__()
-        slices = list()
-        self._accounting_zones = list()
-        self._danger_zones = list()
-        for symbol in np.unique(parsed_level):
-            if symbol == c.VALUE_OCCUPIED_CELL:
-                continue
-            elif symbol == c.DANGER_ZONE:
-                self + symbol
-                slices.append(h.one_hot_level(parsed_level, symbol))
-                self._danger_zones.append(symbol)
-            else:
-                self + symbol
-                slices.append(h.one_hot_level(parsed_level, symbol))
-                self._accounting_zones.append(symbol)
-
-        self._zone_slices = np.stack(slices)
-
-    def __getitem__(self, item):
-        return self._zone_slices[item]
-
-    def add_items(self, other: Union[str, List[str]]):
-        raise AttributeError('You are not allowed to add additional Zones in runtime.')

marl_factory_grid/environment/groups/wall_n_floors.py

@@ -26,6 +26,12 @@ class Walls(PositionMixin, EnvObjects):
     def from_tiles(cls, tiles, *args, **kwargs):
         raise RuntimeError()
 
+    def by_pos(self, pos: (int, int)):
+        try:
+            return super().by_pos(pos)[0]
+        except IndexError:
+            return None
+
 
 class Floors(Walls):
     _entity = Floor