Resolved some warnings and style issues

marl_factory_grid/environment/entity/entity.py

@@ -1,15 +1,14 @@
 import abc
-from collections import defaultdict
 
 import numpy as np
 
-from .object import _Object
+from .object import Object
 from .. import constants as c
 from ...utils.results import ActionResult
 from ...utils.utility_classes import RenderEntity
 
 
-class Entity(_Object, abc.ABC):
+class Entity(Object, abc.ABC):
     """Full Env Entity that lives on the environment Grid. Doors, Items, DirtPile etc..."""
 
     @property
@@ -96,8 +95,9 @@ class Entity(_Object, abc.ABC):
 
     def __init__(self, pos, bind_to=None, **kwargs):
         super().__init__(**kwargs)
+        self._view_directory = c.VALUE_NO_POS
         self._status = None
-        self.set_pos(pos)
+        self._pos = pos
         self._last_pos = pos
         if bind_to:
             try:
@@ -113,10 +113,6 @@ class Entity(_Object, abc.ABC):
     def render(self):
         return RenderEntity(self.__class__.__name__.lower(), self.pos)
 
-    @abc.abstractmethod
-    def render(self):
-        return RenderEntity(self.__class__.__name__.lower(), self.pos)
-
     @property
     def obs_tag(self):
         try:
@@ -133,25 +129,3 @@ class Entity(_Object, abc.ABC):
         self._collection.delete_env_object(self)
         self._collection = other_collection
         return self._collection == other_collection
-
-    @classmethod
-    def from_coordinates(cls, positions: [(int, int)], *args, entity_kwargs=None, **kwargs, ):
-        collection = cls(*args, **kwargs)
-        collection.add_items(
-            [cls._entity(tuple(pos), **entity_kwargs if entity_kwargs is not None else {}) for pos in positions])
-        return collection
-
-    def notify_del_entity(self, entity):
-        try:
-            self.pos_dict[entity.pos].remove(entity)
-        except (ValueError, AttributeError):
-            pass
-
-    def by_pos(self, pos: (int, int)):
-        pos = tuple(pos)
-        try:
-            return self.state.entities.pos_dict[pos]
-        except StopIteration:
-            pass
-        except ValueError:
-            pass

marl_factory_grid/environment/entity/object.py

@@ -5,7 +5,7 @@ from marl_factory_grid.environment import constants as c
 import marl_factory_grid.utils.helpers as h
 
 
-class _Object:
+class Object:
     """Generell Objects for Organisation and Maintanance such as Actions etc..."""
 
     _u_idx = defaultdict(lambda: 0)
@@ -50,15 +50,15 @@ class _Object:
             print(f'Following kwargs were passed, but ignored: {kwargs}')
 
     def __repr__(self):
-            name = self.name
-            if self.bound_entity:
-                name = h.add_bound_name(name, self.bound_entity)
-            try:
-                if self.var_has_position:
-                    name = h.add_pos_name(name, self)
-            except (AttributeError):
-                pass
-            return name
+        name = self.name
+        if self.bound_entity:
+            name = h.add_bound_name(name, self.bound_entity)
+        try:
+            if self.var_has_position:
+                name = h.add_pos_name(name, self)
+        except AttributeError:
+            pass
+        return name
 
     def __eq__(self, other) -> bool:
         return other == self.identifier
@@ -67,8 +67,8 @@ class _Object:
         return hash(self.identifier)
 
     def _identify_and_count_up(self):
-        idx = _Object._u_idx[self.__class__.__name__]
-        _Object._u_idx[self.__class__.__name__] += 1
+        idx = Object._u_idx[self.__class__.__name__]
+        Object._u_idx[self.__class__.__name__] += 1
         return idx
 
     def set_collection(self, collection):
@@ -98,79 +98,3 @@ class _Object:
 
     def unbind(self):
         self._bound_entity = None
-
-
-# class EnvObject(_Object):
-#     """Objects that hold Information that are observable, but have no position on the environment grid. Inventories etc..."""
-#
-    # _u_idx = defaultdict(lambda: 0)
-#
-#     @property
-#     def obs_tag(self):
-#         try:
-#             return self._collection.name or self.name
-#         except AttributeError:
-#             return self.name
-#
-#     @property
-#     def var_is_blocking_light(self):
-#         try:
-#             return self._collection.var_is_blocking_light or False
-#         except AttributeError:
-#             return False
-#
-#     @property
-#     def var_can_be_bound(self):
-#         try:
-#             return self._collection.var_can_be_bound or False
-#         except AttributeError:
-#             return False
-#
-#     @property
-#     def var_can_move(self):
-#         try:
-#             return self._collection.var_can_move or False
-#         except AttributeError:
-#             return False
-#
-#     @property
-#     def var_is_blocking_pos(self):
-#         try:
-#             return self._collection.var_is_blocking_pos or False
-#         except AttributeError:
-#             return False
-#
-#     @property
-#     def var_has_position(self):
-#         try:
-#             return self._collection.var_has_position or False
-#         except AttributeError:
-#             return False
-#
-# @property
-# def var_can_collide(self):
-#     try:
-#         return self._collection.var_can_collide or False
-#     except AttributeError:
-#         return False
-#
-#
-# @property
-# def encoding(self):
-#     return c.VALUE_OCCUPIED_CELL
-#
-#
-# def __init__(self, **kwargs):
-#     self._bound_entity = None
-#     super(EnvObject, self).__init__(**kwargs)
-#
-#
-# def change_parent_collection(self, other_collection):
-#     other_collection.add_item(self)
-#     self._collection.delete_env_object(self)
-#     self._collection = other_collection
-#     return self._collection == other_collection
-#
-#
-# def summarize_state(self):
-#     return dict(name=str(self.name))

marl_factory_grid/environment/entity/util.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from marl_factory_grid.environment.entity.object import _Object
+from marl_factory_grid.environment.entity.object import Object
 
 
 ##########################################################################
@@ -8,7 +8,7 @@ from marl_factory_grid.environment.entity.object import _Object
 ##########################################################################
 
 
-class PlaceHolder(_Object):
+class PlaceHolder(Object):
 
     def __init__(self, *args, fill_value=0, **kwargs):
         super().__init__(*args, **kwargs)
@@ -27,7 +27,7 @@ class PlaceHolder(_Object):
         return self.__class__.__name__
 
 
-class GlobalPosition(_Object):
+class GlobalPosition(Object):
 
     @property
     def encoding(self):