WIP: object, entity rework

marl_factory_grid/environment/entity/entity.py

@@ -1,21 +1,57 @@
 import abc
+from collections import defaultdict
 
+from .object import Object
 from .. import constants as c
-from .object import EnvObject
 from ...utils.render import RenderEntity
 from ...utils.results import ActionResult
 
 
-class Entity(EnvObject, abc.ABC):
+class Entity(Object, abc.ABC):
     """Full Env Entity that lives on the environment Grid. Doors, Items, DirtPile etc..."""
 
+    _u_idx = defaultdict(lambda: 0)
+
     @property
     def state(self):
         return self._status or ActionResult(entity=self, identifier=c.NOOP, validity=c.VALID, reward=0)
 
+    # @property
+    # def var_has_position(self):
+    #     return self.pos != c.VALUE_NO_POS
+    var_has_position: bool = True
+
     @property
-    def var_has_position(self):
-        return self.pos != c.VALUE_NO_POS
+    def var_is_blocking_light(self):
+        try:
+            return self._collection.var_is_blocking_light or False
+        except AttributeError:
+            return False
+
+    # var_is_blocking_light: bool = True
+
+    @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_can_collide(self):
+        try:
+            return self._collection.var_can_collide or False
+        except AttributeError:
+            return False
+
+    # var_can_collide: bool = True
 
     @property
     def x(self):
@@ -29,10 +65,6 @@ class Entity(EnvObject, abc.ABC):
     def pos(self):
         return self._pos
 
-    @property
-    def tile(self):
-        return self._tile  # wall_n_floors funktionalität
-
     # @property
     # def last_tile(self):
     #     try:
@@ -71,7 +103,7 @@ class Entity(EnvObject, abc.ABC):
                 print(f'Objects of {self.__class__.__name__} can not be bound to other entities.')
                 exit()
 
-    def summarize_state(self) -> dict:  # tile=str(self.tile.name)
+    def summarize_state(self) -> dict:
         return dict(name=str(self.name), x=int(self.x), y=int(self.y), can_collide=bool(self.var_can_collide))
 
     @abc.abstractmethod
@@ -80,3 +112,43 @@ class Entity(EnvObject, abc.ABC):
 
     def __repr__(self):
         return super(Entity, self).__repr__() + f'(@{self.pos})'
+
+    @property
+    def obs_tag(self):
+        try:
+            return self._collection.name or self.name
+        except AttributeError:
+            return self.name
+
+    @property
+    def encoding(self):
+        return c.VALUE_OCCUPIED_CELL
+
+    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
+
+    @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]
+            # return next(e for e in self if e.pos == pos)
+        except StopIteration:
+            pass
+        except ValueError:
+            print()

marl_factory_grid/environment/entity/object.py

@@ -12,6 +12,19 @@ class Object:
 
     def __bool__(self):
         return True
+    @property
+    def var_has_position(self):  # brauchen wir das hier jetzt?
+        try:
+            return self.pos != c.VALUE_NO_POS 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 observers(self):
@@ -70,6 +83,14 @@ class Object:
     def summarize_state(self):
         return dict()
 
+    def bind(self, entity):
+        # noinspection PyAttributeOutsideInit
+        self._bound_entity = entity
+        return c.VALID
+
+    def belongs_to_entity(self, entity):
+        return self._bound_entity == entity
+
 
 class EnvObject(Object):
 

marl_factory_grid/environment/entity/util.py

@@ -30,7 +30,7 @@ class PlaceHolder(Object):
         return "PlaceHolder"
 
 
-class GlobalPosition(BoundEntityMixin, EnvObject):
+class GlobalPosition(Object):
 
     @property
     def encoding(self):

marl_factory_grid/environment/entity/wall_floor.py

@@ -3,6 +3,7 @@ from typing import List
 import numpy as np
 
 from marl_factory_grid.environment import constants as c
+from marl_factory_grid.environment.entity.entity import Entity
 from marl_factory_grid.environment.entity.object import EnvObject
 from marl_factory_grid.utils.render import RenderEntity
 from marl_factory_grid.utils import helpers as h
@@ -109,7 +110,7 @@ class Floor(EnvObject):
         return None
 
 
-class Wall(Floor):
+class Wall(Entity):
 
     @property
     def var_can_collide(self):

marl_factory_grid/environment/groups/agents.py

@@ -1,9 +1,9 @@
 from marl_factory_grid.environment.entity.agent import Agent
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 
 
-class Agents(PositionMixin, EnvObjects):
+class Agents(PositionMixin, Collection):
     _entity = Agent
     is_blocking_light = False
     can_move = True

marl_factory_grid/environment/groups/env_objects.py

@@ -2,26 +2,27 @@ from marl_factory_grid.environment.groups.objects import Objects
 from marl_factory_grid.environment.entity.object import EnvObject
 
 
-class EnvObjects(Objects):
-
+class Collection(Objects):
     _entity = EnvObject
     var_is_blocking_light: bool = False
     var_can_collide: bool = False
-    var_has_position: bool = False
     var_can_move: bool = False
-    var_can_be_bound: bool = False
+
+    var_has_position: bool = False  # alles was posmixin hat true
+    var_has_bound = False  # batteries, globalpos, inventories true
+    var_can_be_bound: bool = False  # == ^
 
     @property
     def encodings(self):
         return [x.encoding for x in self]
 
     def __init__(self, size, *args, **kwargs):
-        super(EnvObjects, self).__init__(*args, **kwargs)
+        super(Collection, self).__init__(*args, **kwargs)
         self.size = size
 
     def add_item(self, item: EnvObject):
         assert self.var_has_position or (len(self) <= self.size)
-        super(EnvObjects, self).add_item(item)
+        super(Collection, self).add_item(item)
         return self
 
     def delete_env_object(self, env_object: EnvObject):
@@ -29,3 +30,19 @@ class EnvObjects(Objects):
 
     def delete_env_object_by_name(self, name):
         del self[name]
+
+    @property
+    def obs_pairs(self):
+        return [(x.name, x) for x in self]
+
+    def by_entity(self, entity):
+        try:
+            return next((x for x in self if x.belongs_to_entity(entity)))
+        except (StopIteration, AttributeError):
+            return None
+
+    def idx_by_entity(self, entity):
+        try:
+            return next((idx for idx, x in enumerate(self) if x.belongs_to_entity(entity)))
+        except (StopIteration, AttributeError):
+            return None

marl_factory_grid/environment/groups/mixins.py

@@ -19,15 +19,6 @@ class PositionMixin:
     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_coordinates(cls, positions: [(int, int)], *args, entity_kwargs=None, **kwargs, ):
         collection = cls(*args, **kwargs)

marl_factory_grid/environment/groups/utils.py

@@ -3,7 +3,7 @@ from typing import List, Union
 import numpy as np
 
 from marl_factory_grid.environment.entity.util import GlobalPosition
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin, HasBoundMixin
 from marl_factory_grid.environment.groups.objects import Objects
 from marl_factory_grid.modules.zones import Zone
@@ -11,7 +11,7 @@ from marl_factory_grid.utils import helpers as h
 from marl_factory_grid.environment import constants as c
 
 
-class Combined(PositionMixin, EnvObjects):
+class Combined(PositionMixin, Collection):
 
     @property
     def name(self):
@@ -35,7 +35,7 @@ class Combined(PositionMixin, EnvObjects):
         return [(name, None) for name in self.names]
 
 
-class GlobalPositions(HasBoundMixin, EnvObjects):
+class GlobalPositions(Collection):
 
     _entity = GlobalPosition
     is_blocking_light = False,

marl_factory_grid/environment/groups/wall_n_floors.py

@@ -2,12 +2,12 @@ import random
 from typing import List, Tuple
 
 from marl_factory_grid.environment import constants as c
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.environment.entity.wall_floor import Wall, Floor
 
 
-class Walls(PositionMixin, EnvObjects):
+class Walls(PositionMixin, Collection):
     _entity = Wall
     symbol = c.SYMBOL_WALL
 

marl_factory_grid/modules/batteries/entitites.py

@@ -1,5 +1,5 @@
 from marl_factory_grid.environment.entity.mixin import BoundEntityMixin
-from marl_factory_grid.environment.entity.object import EnvObject
+from marl_factory_grid.environment.entity.object import EnvObject, Object
 from marl_factory_grid.environment.entity.entity import Entity
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.utils.render import RenderEntity
@@ -7,7 +7,7 @@ from marl_factory_grid.utils.render import RenderEntity
 from marl_factory_grid.modules.batteries import constants as b
 
 
-class Battery(BoundEntityMixin, EnvObject):
+class Battery(Object):
 
     @property
     def is_discharged(self):

marl_factory_grid/modules/batteries/groups.py

@@ -1,9 +1,9 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin, HasBoundMixin
 from marl_factory_grid.modules.batteries.entitites import Pod, Battery
 
 
-class Batteries(HasBoundMixin, EnvObjects):
+class Batteries(Collection):
 
     _entity = Battery
     is_blocking_light: bool = False
@@ -21,7 +21,7 @@ class Batteries(HasBoundMixin, EnvObjects):
         self.add_items(batteries)
 
 
-class ChargePods(PositionMixin, EnvObjects):
+class ChargePods(PositionMixin, Collection):
 
     _entity = Pod
 

marl_factory_grid/modules/clean_up/groups.py

@@ -1,4 +1,4 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.environment.entity.wall_floor import Floor
 from marl_factory_grid.modules.clean_up.entitites import DirtPile
@@ -6,7 +6,7 @@ from marl_factory_grid.modules.clean_up.entitites import DirtPile
 from marl_factory_grid.environment import constants as c
 
 
-class DirtPiles(PositionMixin, EnvObjects):
+class DirtPiles(PositionMixin, Collection):
     _entity = DirtPile
     is_blocking_light: bool = False
     can_collide: bool = False

marl_factory_grid/modules/destinations/groups.py

@@ -1,11 +1,11 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.modules.destinations.entitites import Destination
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.modules.destinations import constants as d
 
 
-class Destinations(PositionMixin, EnvObjects):
+class Destinations(PositionMixin, Collection):
     _entity = Destination
     is_blocking_light: bool = False
     can_collide: bool = False

marl_factory_grid/modules/doors/entitites.py

@@ -51,7 +51,7 @@ class Door(Entity):
         else:
             self._close()
         if indicate_area:
-            self._collection.add_items([DoorIndicator(x) for x in self.tile.neighboring_floor])
+            self._collection.add_items([DoorIndicator(x) for x in self.state.entities.neighboring_positions(self.pos)])
 
     def summarize_state(self):
         state_dict = super().summarize_state()

marl_factory_grid/modules/doors/groups.py

@@ -1,12 +1,12 @@
 from typing import Union
 
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.modules.doors import constants as d
 from marl_factory_grid.modules.doors.entitites import Door
 
 
-class Doors(PositionMixin, EnvObjects):
+class Doors(PositionMixin, Collection):
 
     symbol = d.SYMBOL_DOOR
     _entity = Door

marl_factory_grid/modules/items/groups.py

@@ -1,14 +1,14 @@
 from marl_factory_grid.modules.items import constants as i
 from marl_factory_grid.environment import constants as c
 
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.objects import Objects
 from marl_factory_grid.environment.groups.mixins import PositionMixin, IsBoundMixin, HasBoundMixin
 from marl_factory_grid.environment.entity.agent import Agent
 from marl_factory_grid.modules.items.entitites import Item, DropOffLocation
 
 
-class Items(PositionMixin, EnvObjects):
+class Items(PositionMixin, Collection):
     _entity = Item
     is_blocking_light: bool = False
     can_collide: bool = False
@@ -28,7 +28,7 @@ class Items(PositionMixin, EnvObjects):
             return 0
 
 
-class Inventory(IsBoundMixin, EnvObjects):
+class Inventory(IsBoundMixin, Collection):
     _accepted_objects = Item
 
     @property
@@ -90,7 +90,7 @@ class Inventories(HasBoundMixin, Objects):
         state[i.INVENTORY].spawn(state[c.AGENT])
 
 
-class DropOffLocations(PositionMixin, EnvObjects):
+class DropOffLocations(PositionMixin, Collection):
     _entity = DropOffLocation
     is_blocking_light: bool = False
     can_collide: bool = False

marl_factory_grid/modules/machines/groups.py

@@ -1,10 +1,10 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 
 from .entitites import Machine
 
 
-class Machines(PositionMixin, EnvObjects):
+class Machines(PositionMixin, Collection):
 
     _entity = Machine
     is_blocking_light: bool = False

marl_factory_grid/modules/maintenance/groups.py

@@ -2,7 +2,7 @@ from typing import List
 
 from .entities import Maintainer
 from marl_factory_grid.environment.entity.wall_floor import Floor
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from ..machines.actions import MachineAction
 from ...utils.states import Gamestate
@@ -10,7 +10,7 @@ from ...utils.states import Gamestate
 from ..machines import constants as mc
 
 
-class Maintainers(PositionMixin, EnvObjects):
+class Maintainers(PositionMixin, Collection):
 
     _entity = Maintainer
     var_can_collide = True