steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-06-19 19:02:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into refactor_rename

Browse Source 
# Conflicts:
#	marl_factory_grid/configs/default_config.yaml
#	marl_factory_grid/environment/entity/object.py
This commit is contained in:
Chanumask
2023-10-31 10:28:25 +01:00
parent ea6634b187 acd545dc0e
commit ee4d29d50b
18 changed files with 217 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
marl_factory_grid/environment/entity/object.py
View File

@ -40,17 +40,6 @@ class _Object:
name = h.add_pos_name(name, self)
return name
# @property
# def name(self):
# name = f"{self.__class__.__name__}"
# if self.bound_entity:
# name += f"[{self.bound_entity.name}]"
# if self._str_ident is not None:
# name += f"({self._str_ident})"
# else:
# name += f"(#{self.u_int})"
# return name
@property
def identifier(self):
if self._str_ident is not None:
@ -165,25 +154,30 @@ class _Object:
# 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 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):
# super(EnvObject, self).__init__(**kwargs)
# @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
#
# def summarize_state(self):
# return dict(name=str(self.name))
# 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))