no more tiles no more floor

marl_factory_grid/environment/groups/global_entities.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
 from operator import itemgetter
+from random import shuffle
 from typing import Dict
 
 from marl_factory_grid.environment.groups.objects import Objects
@@ -13,7 +14,7 @@ class Entities(Objects):
     def neighboring_positions(pos):
         return (POS_MASK + pos).reshape(-1, 2)
 
-    def get_near_pos(self, pos):
+    def get_entities_near_pos(self, pos):
         return [y for x in itemgetter(*(tuple(x) for x in self.neighboring_positions(pos)))(self.pos_dict) for y in x]
 
     def render(self):
@@ -38,11 +39,17 @@ class Entities(Objects):
     def guests_that_can_collide(self, pos):
         return[x for val in self.pos_dict[pos] for x in val if x.var_can_collide]
 
-    def empty_tiles(self):
-        return[key for key in self.floorlist if not any(self.pos_dict[key])]
+    @property
+    def empty_positions(self):
+        empty_positions= [key for key in self.floorlist if self.pos_dict[key]]
+        shuffle(empty_positions)
+        return empty_positions
 
-    def occupied_tiles(self):   # positions that are not empty
-        return[key for key in self.floorlist if any(self.pos_dict[key])]
+    @property
+    def occupied_positions(self):   # positions that are not empty
+        empty_positions = [key for key in self.floorlist if self.pos_dict[key]]
+        shuffle(empty_positions)
+        return empty_positions
 
     def is_blocked(self):
         return[key for key, val in self.pos_dict.items() if any([x.var_is_blocking_pos for x in val])]

marl_factory_grid/environment/groups/mixins.py

@@ -37,7 +37,11 @@ class PositionMixin:
 
     def __delitem__(self, name):
         idx, obj = next((i, obj) for i, obj in enumerate(self) if obj.name == name)
-        obj.tile.leave(obj)     # observer notify?
+        try:
+            for observer in obj.observers:
+                observer.notify_del_entity(obj)
+        except AttributeError:
+            pass
         super().__delitem__(name)
 
     def by_pos(self, pos: (int, int)):

marl_factory_grid/environment/groups/objects.py

@@ -103,6 +103,9 @@ class Objects:
         except StopIteration:
             return None
 
+    def by_name(self, name):
+        return next(x for x in self if x.name == name)
+
     def __getitem__(self, item):
         if isinstance(item, (int, np.int64, np.int32)):
             if item < 0:
@@ -120,7 +123,7 @@ class Objects:
             raise TypeError
 
     def __repr__(self):
-        repr_dict = { key: val for key, val in self._data.items() if key not in [c.WALLS, c.FLOORS]}
+        repr_dict = { key: val for key, val in self._data.items() if key not in [c.WALLS]}
         return f'{self.__class__.__name__}[{repr_dict}]'
 
     def spawn(self, n: int):
@@ -132,22 +135,25 @@ class Objects:
         for item in items:
             del self[item]
 
-    def notify_change_pos(self, entity: object):
-        try:
-            self.pos_dict[entity.last_pos].remove(entity)
-        except (ValueError, AttributeError):
-            pass
-        if entity.var_has_position:
-            try:
-                self.pos_dict[entity.pos].append(entity)
-            except (ValueError, AttributeError):
-                pass
+    # def notify_change_pos(self, entity: object):
+    #     try:
+    #         self.pos_dict[entity.last_pos].remove(entity)
+    #     except (ValueError, AttributeError):
+    #         pass
+    #     if entity.var_has_position:
+    #         try:
+    #             self.pos_dict[entity.pos].append(entity)
+    #         except (ValueError, AttributeError):
+    #             pass
 
     def notify_del_entity(self, entity: Object):
         try:
             entity.del_observer(self)
+        except AttributeError:
+            pass
+        try:
             self.pos_dict[entity.pos].remove(entity)
-        except (ValueError, AttributeError):
+        except (AttributeError, ValueError, IndexError):
             pass
 
     def notify_add_entity(self, entity: Object):

marl_factory_grid/environment/groups/walls.py

@@ -15,6 +15,7 @@ class Walls(PositionMixin, EnvObjects):
         super(Walls, self).__init__(*args, **kwargs)
         self._value = c.VALUE_OCCUPIED_CELL
 
+    #ToDo: Do we need this? Move to spawn methode?
     # @classmethod
     # def from_coordinates(cls, argwhere_coordinates, *args, **kwargs):
     #     tiles = cls(*args, **kwargs)