From 0083f027d2f552ce69cbf13fe21948e14b4945d3 Mon Sep 17 00:00:00 2001 From: Steffen Illium Date: Fri, 20 Oct 2023 15:38:27 +0200 Subject: [PATCH] test new pipeline --- marl_factory_grid/environment/entity/entity.py | 2 +- marl_factory_grid/environment/groups/mixins.py | 9 --------- setup.py | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/marl_factory_grid/environment/entity/entity.py b/marl_factory_grid/environment/entity/entity.py index f24c86c..92138ff 100644 --- a/marl_factory_grid/environment/entity/entity.py +++ b/marl_factory_grid/environment/entity/entity.py @@ -73,7 +73,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 diff --git a/marl_factory_grid/environment/groups/mixins.py b/marl_factory_grid/environment/groups/mixins.py index 7171d43..1a0e885 100644 --- a/marl_factory_grid/environment/groups/mixins.py +++ b/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) diff --git a/setup.py b/setup.py index 6d12a87..e095cc4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ long_description = (this_directory / "README.md").read_text() setup(name='Marl-Factory-Grid', - version='0.1.2', + version='0.1.9', description='A framework to research MARL agents in various setings.', author='Steffen Illium', author_email='steffen.illium@ifi.lmu.de',