WIP: object, entity rework

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