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/utils/config_parser.py

@@ -16,7 +16,6 @@ MODULE_PATH = 'modules'
 
 
 class FactoryConfigParser(object):
-
     default_entites = []
     default_rules = ['MaxStepsReached', 'Collision']
     default_actions = [c.MOVE8, c.NOOP]

marl_factory_grid/utils/level_parser.py

@@ -23,7 +23,7 @@ class LevelParser(object):
         self._parsed_level = h.parse_level(Path(level_file_path))
         level_array = h.one_hot_level(self._parsed_level, c.SYMBOL_WALL)
         self.level_shape = level_array.shape
-        self.size = self.pomdp_r**2 if self.pomdp_r else np.prod(self.level_shape)
+        self.size = self.pomdp_r ** 2 if self.pomdp_r else np.prod(self.level_shape)
 
     def get_coordinates_for_symbol(self, symbol, negate=False):
         level_array = h.one_hot_level(self._parsed_level, symbol)
@@ -33,14 +33,17 @@ class LevelParser(object):
             return np.argwhere(level_array == c.VALUE_OCCUPIED_CELL)
 
     def do_init(self):
-        entities = Entities()
+        # Global Entities
+        list_of_all_floors = ([tuple(floor) for floor in self.get_coordinates_for_symbol(c.SYMBOL_WALL, negate=True)])
+        entities = Entities(list_of_all_floors)
+
         # Walls
         walls = Walls.from_coordinates(self.get_coordinates_for_symbol(c.SYMBOL_WALL), self.size)
         entities.add_items({c.WALLS: walls})
 
         # Floor
-        floor = Floors.from_coordinates(self.get_coordinates_for_symbol(c.SYMBOL_WALL, negate=True), self.size)
-        entities.add_items({c.FLOORS: floor})
+        floor = Floors.from_coordinates(list_of_all_floors, self.size)
+        entities.add_items({c.FLOOR: floor})
         entities.add_items({c.AGENT: Agents(self.size)})
 
         # All other
@@ -56,8 +59,7 @@ class LevelParser(object):
                     if np.any(level_array):
                         # TODO: Get rid of this!
                         e = e_class.from_coordinates(np.argwhere(level_array == c.VALUE_OCCUPIED_CELL).tolist(),
-                                                     entities[c.FLOORS], self.size, entity_kwargs=e_kwargs
-                                                     )
+                                                     self.size, entity_kwargs=e_kwargs)
                     else:
                         raise ValueError(f'No {e_class} (Symbol: {e_class.symbol}) could be found!\n'
                                          f'Check your level file!')

marl_factory_grid/utils/states.py

@@ -1,8 +1,7 @@
-from typing import List, Dict
+from typing import List, Dict, Tuple
 
 import numpy as np
 
-
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.environment.entity.wall_floor import Floor
 from marl_factory_grid.environment.groups.global_entities import Entities
@@ -60,11 +59,10 @@ class Gamestate(object):
 
     @property
     def moving_entites(self):
-        return [y for x in self.entities for y in x if x.var_can_move]
+        return [y for x in self.entities for y in x if x.var_can_move]  # wird das aus dem String gelesen?
 
-    def __init__(self, entitites, agents_conf, rules: Dict[str, dict], env_seed=69, verbose=False):
-        self.entities: Entities = entitites
-        self.NO_POS_TILE = Floor(c.VALUE_NO_POS)
+    def __init__(self, entities, agents_conf, rules: Dict[str, dict], env_seed=69, verbose=False):
+        self.entities = entities
         self.curr_step = 0
         self.curr_actions = None
         self.agents_conf = agents_conf
@@ -114,8 +112,22 @@ class Gamestate(object):
                 results.extend(on_check_done_result)
         return results
 
-    def get_all_tiles_with_collisions(self) -> List[Floor]:
-        tiles = [self[c.FLOORS].by_pos(pos) for pos, e in self.entities.pos_dict.items()
-                 if sum([x.var_can_collide for x in e]) > 1]
-        # tiles = [x for x in self[c.FLOOR] if len(x.guests_that_can_collide) > 1]
-        return tiles
+    # def get_all_tiles_with_collisions(self) -> List[Floor]:
+    #     tiles = [self[c.FLOORS].by_pos(pos) for pos, e in self.entities.pos_dict.items()
+    #              if sum([x.var_can_collide for x in e]) > 1]
+    #     # tiles = [x for x in self[c.FLOOR] if len(x.guests_that_can_collide) > 1]
+    #     return tiles
+
+    def get_all_pos_with_collisions(self) -> List[Tuple[(int, int)]]:
+        positions = [pos for pos, e in self.entities.pos_dict.items()
+                     if sum([x.var_can_collide for x in e]) > 1]
+        return positions
+
+    def check_move_validity(self, moving_entity, position):
+        #         if (guest.name not in self._guests and not self.is_blocked)
+        #         and not (guest.var_is_blocking_pos and self.is_occupied()):
+        if moving_entity.pos != position and not any(
+                entity.var_is_blocking_pos for entity in self.entities.pos_dict[position]) and not (
+                moving_entity.var_is_blocking_pos and moving_entity.is_occupied()):
+            return True
+        return False