Merge branch 'remove-tiles'

# Conflicts:
#	marl_factory_grid/environment/actions.py
#	marl_factory_grid/environment/entity/entity.py
#	marl_factory_grid/environment/factory.py
#	marl_factory_grid/modules/batteries/rules.py
#	marl_factory_grid/modules/clean_up/groups.py
#	marl_factory_grid/modules/destinations/entitites.py
#	marl_factory_grid/modules/destinations/groups.py
#	marl_factory_grid/modules/destinations/rules.py
#	marl_factory_grid/modules/items/rules.py
#	marl_factory_grid/modules/maintenance/entities.py
#	marl_factory_grid/utils/config_parser.py
#	marl_factory_grid/utils/level_parser.py
#	marl_factory_grid/utils/states.py

marl_factory_grid/environment/groups/global_entities.py

@@ -23,10 +23,33 @@ class Entities(Objects):
     def names(self):
         return list(self._data.keys())
 
-    def __init__(self):
+    @property
+    def floorlist(self):
+        return self._floor_positions
+
+    def __init__(self, floor_positions):
+        self._floor_positions = floor_positions
         self.pos_dict = defaultdict(list)
         super().__init__()
 
+    # def all_floors(self):
+    #     return[key for key, val in self.pos_dict.items() if any('floor' in x.name.lower() for x in val)]
+
+    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])]
+
+    def occupied_tiles(self):   # positions that are not empty
+        return[key for key in self.floorlist if any(self.pos_dict[key])]
+
+    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])]
+
+    def is_not_blocked(self):
+        return[key for key, val in self.pos_dict.items() if not all([x.var_is_blocking_pos for x in val])]
+
     def iter_entities(self):
         return iter((x for sublist in self.values() for x in sublist))
 

marl_factory_grid/environment/groups/mixins.py

@@ -1,4 +1,6 @@
-from typing import List
+from typing import List, Tuple
+
+import numpy as np
 
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.environment.entity.entity import Entity
@@ -6,40 +8,36 @@ from marl_factory_grid.environment.entity.wall_floor import Floor
 
 
 class PositionMixin:
-
     _entity = Entity
     var_is_blocking_light: bool = True
     var_can_collide: bool = True
     var_has_position: bool = True
 
-    def spawn(self, tiles: List[Floor]):
-        self.add_items([self._entity(tile) for tile in tiles])
+    def spawn(self, coords: List[Tuple[(int, int)]]):
+        self.add_items([self._entity(pos) for pos in coords])
 
     def render(self):
         return [y for y in [x.render() for x in self] if y is not None]
 
+    # @classmethod
+    # def from_tiles(cls, tiles, *args, entity_kwargs=None, **kwargs):
+    #     collection = cls(*args, **kwargs)
+    #     entities = [cls._entity(tile, str_ident=i,
+    #                             **entity_kwargs if entity_kwargs is not None else {})
+    #                 for i, tile in enumerate(tiles)]
+    #     collection.add_items(entities)
+    #     return collection
+
     @classmethod
-    def from_tiles(cls, tiles, *args, entity_kwargs=None, **kwargs):
+    def from_coordinates(cls, positions: [(int, int)], *args, entity_kwargs=None, **kwargs, ):
         collection = cls(*args, **kwargs)
-        entities = [cls._entity(tile, str_ident=i,
-                                **entity_kwargs if entity_kwargs is not None else {})
-                    for i, tile in enumerate(tiles)]
-        collection.add_items(entities)
+        collection.add_items(
+            [cls._entity(tuple(pos), **entity_kwargs if entity_kwargs is not None else {}) for pos in positions])
         return collection
 
-    @classmethod
-    def from_coordinates(cls, positions: [(int, int)], tiles, *args, entity_kwargs=None, **kwargs, ):
-        return cls.from_tiles([tiles.by_pos(position) for position in positions], tiles.size, *args,
-                              entity_kwargs=entity_kwargs,
-                              **kwargs)
-
-    @property
-    def tiles(self):
-        return [entity.tile for entity in self]
-
     def __delitem__(self, name):
         idx, obj = next((i, obj) for i, obj in enumerate(self) if obj.name == name)
-        obj.tile.leave(obj)
+        obj.tile.leave(obj)     # observer notify?
         super().__delitem__(name)
 
     def by_pos(self, pos: (int, int)):

marl_factory_grid/environment/groups/wall_n_floors.py

@@ -1,5 +1,5 @@
 import random
-from typing import List
+from typing import List, Tuple
 
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.environment.groups.env_objects import EnvObjects
@@ -15,16 +15,12 @@ class Walls(PositionMixin, EnvObjects):
         super(Walls, self).__init__(*args, **kwargs)
         self._value = c.VALUE_OCCUPIED_CELL
 
-    @classmethod
-    def from_coordinates(cls, argwhere_coordinates, *args, **kwargs):
-        tiles = cls(*args, **kwargs)
-        # noinspection PyTypeChecker
-        tiles.add_items([cls._entity(pos) for pos in argwhere_coordinates])
-        return tiles
-
-    @classmethod
-    def from_tiles(cls, tiles, *args, **kwargs):
-        raise RuntimeError()
+    # @classmethod
+    # def from_coordinates(cls, argwhere_coordinates, *args, **kwargs):
+    #     tiles = cls(*args, **kwargs)
+    #     # noinspection PyTypeChecker
+    #     tiles.add_items([cls._entity(pos) for pos in argwhere_coordinates])
+    #     return tiles
 
     def by_pos(self, pos: (int, int)):
         try:
@@ -43,18 +39,4 @@ class Floors(Walls):
         super(Floors, self).__init__(*args, **kwargs)
         self._value = c.VALUE_FREE_CELL
 
-    @property
-    def occupied_tiles(self):
-        tiles = [tile for tile in self if tile.is_occupied()]
-        random.shuffle(tiles)
-        return tiles
 
-    @property
-    def empty_tiles(self) -> List[Floor]:
-        tiles = [tile for tile in self if tile.is_empty()]
-        random.shuffle(tiles)
-        return tiles
-
-    @classmethod
-    def from_tiles(cls, tiles, *args, **kwargs):
-        raise RuntimeError()