mirror of
https://github.com/illiumst/marl-factory-grid.git
synced 2025-11-02 21:47:25 +01:00
Comments, small bugfixes removed legacy elements
This commit is contained in:
@@ -23,6 +23,7 @@ Agents:
|
|||||||
- DropOffLocations
|
- DropOffLocations
|
||||||
- Maintainers
|
- Maintainers
|
||||||
Entities:
|
Entities:
|
||||||
|
|
||||||
Batteries:
|
Batteries:
|
||||||
initial_charge: 0.8
|
initial_charge: 0.8
|
||||||
per_action_costs: 0.02
|
per_action_costs: 0.02
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ SYMBOL_FLOOR = '-'
|
|||||||
|
|
||||||
VALID = True # Identifier to rename boolean values in the context of actions.
|
VALID = True # Identifier to rename boolean values in the context of actions.
|
||||||
NOT_VALID = False # Identifier to rename boolean values in the context of actions.
|
NOT_VALID = False # Identifier to rename boolean values in the context of actions.
|
||||||
|
|
||||||
VALUE_FREE_CELL = 0 # Free-Cell value used in observation
|
VALUE_FREE_CELL = 0 # Free-Cell value used in observation
|
||||||
VALUE_OCCUPIED_CELL = 1 # Occupied-Cell value used in observation
|
VALUE_OCCUPIED_CELL = 1 # Occupied-Cell value used in observation
|
||||||
VALUE_NO_POS = (-9999, -9999) # Invalid Position value used in the environment (smth. is off-grid)
|
VALUE_NO_POS = (-9999, -9999) # Invalid Position value used in the environment (smth. is off-grid)
|
||||||
|
|||||||
@@ -14,37 +14,70 @@ class Agent(Entity):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def var_is_paralyzed(self):
|
def var_is_paralyzed(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return len(self._paralyzed)
|
return len(self._paralyzed)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def paralyze_reasons(self):
|
def paralyze_reasons(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return [x for x in self._paralyzed]
|
return [x for x in self._paralyzed]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def obs_tag(self):
|
def obs_tag(self):
|
||||||
|
"""Internal Usage"""
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def actions(self):
|
def actions(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self._actions
|
return self._actions
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def observations(self):
|
def observations(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self._observations
|
return self._observations
|
||||||
|
|
||||||
def step_result(self):
|
def step_result(self):
|
||||||
pass
|
"""
|
||||||
|
TODO
|
||||||
|
FIXME THINK ITS LEGACY... Not Used any more
|
||||||
|
|
||||||
@property
|
|
||||||
def collection(self):
|
:return:
|
||||||
return self._collection
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def var_is_blocking_pos(self):
|
def var_is_blocking_pos(self):
|
||||||
return self._is_blocking_pos
|
return self._is_blocking_pos
|
||||||
|
|
||||||
|
|
||||||
def __init__(self, actions: List[Action], observations: List[str], *args, is_blocking_pos=False, **kwargs):
|
def __init__(self, actions: List[Action], observations: List[str], *args, is_blocking_pos=False, **kwargs):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super(Agent, self).__init__(*args, **kwargs)
|
super(Agent, self).__init__(*args, **kwargs)
|
||||||
self._paralyzed = set()
|
self._paralyzed = set()
|
||||||
self.step_result = dict()
|
self.step_result = dict()
|
||||||
@@ -54,26 +87,53 @@ class Agent(Entity):
|
|||||||
self._is_blocking_pos = is_blocking_pos
|
self._is_blocking_pos = is_blocking_pos
|
||||||
|
|
||||||
def summarize_state(self):
|
def summarize_state(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
state_dict = super().summarize_state()
|
state_dict = super().summarize_state()
|
||||||
state_dict.update(valid=bool(self.state.validity), action=str(self.state.identifier))
|
state_dict.update(valid=bool(self.state.validity), action=str(self.state.identifier))
|
||||||
return state_dict
|
return state_dict
|
||||||
|
|
||||||
def set_state(self, action_result):
|
def set_state(self, state):
|
||||||
self._status = action_result
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
self._status = state
|
||||||
|
return c.VALID
|
||||||
|
|
||||||
|
|
||||||
def paralyze(self, reason):
|
def paralyze(self, reason):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self._paralyzed.add(reason)
|
self._paralyzed.add(reason)
|
||||||
return c.VALID
|
return c.VALID
|
||||||
|
|
||||||
def de_paralyze(self, reason):
|
def de_paralyze(self, reason) -> bool:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
self._paralyzed.remove(reason)
|
self._paralyzed.remove(reason)
|
||||||
return c.VALID
|
return c.VALID
|
||||||
except KeyError:
|
except KeyError:
|
||||||
return c.NOT_VALID
|
return c.NOT_VALID
|
||||||
|
|
||||||
def render(self):
|
def render(self) -> RenderEntity:
|
||||||
i = next(idx for idx, x in enumerate(self._collection) if x.name == self.name)
|
i = self.collection.idx_by_entity(self)
|
||||||
|
assert i is not None
|
||||||
curr_state = self.state
|
curr_state = self.state
|
||||||
if curr_state.identifier == c.COLLISION:
|
if curr_state.identifier == c.COLLISION:
|
||||||
render_state = renderer.STATE_COLLISION
|
render_state = renderer.STATE_COLLISION
|
||||||
|
|||||||
@@ -4,23 +4,40 @@ import numpy as np
|
|||||||
|
|
||||||
from .object import Object
|
from .object import Object
|
||||||
from .. import constants as c
|
from .. import constants as c
|
||||||
from ...utils.results import ActionResult
|
from ...utils.results import State
|
||||||
from ...utils.utility_classes import RenderEntity
|
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
|
@property
|
||||||
def state(self):
|
def state(self):
|
||||||
return self._status or ActionResult(entity=self, identifier=c.NOOP, validity=c.VALID)
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
return self._status or State(entity=self, identifier=c.NOOP, validity=c.VALID)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def var_has_position(self):
|
def var_has_position(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.pos != c.VALUE_NO_POS
|
return self.pos != c.VALUE_NO_POS
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def var_is_blocking_light(self):
|
def var_is_blocking_light(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return self._collection.var_is_blocking_light or False
|
return self._collection.var_is_blocking_light or False
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
@@ -28,6 +45,12 @@ class Entity(Object, abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def var_can_move(self):
|
def var_can_move(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return self._collection.var_can_move or False
|
return self._collection.var_can_move or False
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
@@ -35,6 +58,12 @@ class Entity(Object, abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def var_is_blocking_pos(self):
|
def var_is_blocking_pos(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return self._collection.var_is_blocking_pos or False
|
return self._collection.var_is_blocking_pos or False
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
@@ -42,6 +71,12 @@ class Entity(Object, abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def var_can_collide(self):
|
def var_can_collide(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return self._collection.var_can_collide or False
|
return self._collection.var_can_collide or False
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
@@ -49,22 +84,53 @@ class Entity(Object, abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def x(self):
|
def x(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.pos[0]
|
return self.pos[0]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def y(self):
|
def y(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.pos[1]
|
return self.pos[1]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def pos(self):
|
def pos(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self._pos
|
return self._pos
|
||||||
|
|
||||||
def set_pos(self, pos):
|
def set_pos(self, pos) -> bool:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
assert isinstance(pos, tuple) and len(pos) == 2
|
assert isinstance(pos, tuple) and len(pos) == 2
|
||||||
self._pos = pos
|
self._pos = pos
|
||||||
|
return c.VALID
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def last_pos(self):
|
def last_pos(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return self._last_pos
|
return self._last_pos
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
@@ -74,12 +140,24 @@ class Entity(Object, abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def direction_of_view(self):
|
def direction_of_view(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
if self._last_pos != c.VALUE_NO_POS:
|
if self._last_pos != c.VALUE_NO_POS:
|
||||||
return 0, 0
|
return 0, 0
|
||||||
else:
|
else:
|
||||||
return np.subtract(self._last_pos, self.pos)
|
return np.subtract(self._last_pos, self.pos)
|
||||||
|
|
||||||
def move(self, next_pos, state):
|
def move(self, next_pos, state):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
next_pos = next_pos
|
next_pos = next_pos
|
||||||
curr_pos = self._pos
|
curr_pos = self._pos
|
||||||
if not_same_pos := curr_pos != next_pos:
|
if not_same_pos := curr_pos != next_pos:
|
||||||
@@ -95,11 +173,19 @@ class Entity(Object, abc.ABC):
|
|||||||
return not_same_pos
|
return not_same_pos
|
||||||
|
|
||||||
def __init__(self, pos, bind_to=None, **kwargs):
|
def __init__(self, pos, bind_to=None, **kwargs):
|
||||||
|
"""
|
||||||
|
Full Env Entity that lives on the environment Grid. Doors, Items, DirtPile etc...
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
self._view_directory = c.VALUE_NO_POS
|
self._view_directory = c.VALUE_NO_POS
|
||||||
self._status = None
|
self._status = None
|
||||||
self._pos = pos
|
self._pos = pos
|
||||||
self._last_pos = pos
|
self._last_pos = pos
|
||||||
|
self._collection = None
|
||||||
if bind_to:
|
if bind_to:
|
||||||
try:
|
try:
|
||||||
self.bind_to(bind_to)
|
self.bind_to(bind_to)
|
||||||
@@ -108,14 +194,27 @@ class Entity(Object, abc.ABC):
|
|||||||
exit()
|
exit()
|
||||||
|
|
||||||
def summarize_state(self) -> dict:
|
def summarize_state(self) -> dict:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return dict(name=str(self.name), x=int(self.x), y=int(self.y), can_collide=bool(self.var_can_collide))
|
return dict(name=str(self.name), x=int(self.x), y=int(self.y), can_collide=bool(self.var_can_collide))
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
def render(self):
|
def render(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return RenderEntity(self.__class__.__name__.lower(), self.pos)
|
return RenderEntity(self.__class__.__name__.lower(), self.pos)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def obs_tag(self):
|
def obs_tag(self):
|
||||||
|
"""Internal Usage"""
|
||||||
try:
|
try:
|
||||||
return self._collection.name or self.name
|
return self._collection.name or self.name
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
@@ -123,10 +222,32 @@ class Entity(Object, abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def encoding(self):
|
def encoding(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return c.VALUE_OCCUPIED_CELL
|
return c.VALUE_OCCUPIED_CELL
|
||||||
|
|
||||||
def change_parent_collection(self, other_collection):
|
def change_parent_collection(self, other_collection):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
other_collection.add_item(self)
|
other_collection.add_item(self)
|
||||||
self._collection.delete_env_object(self)
|
self._collection.delete_env_object(self)
|
||||||
self._collection = other_collection
|
self._collection = other_collection
|
||||||
return self._collection == other_collection
|
return self._collection == other_collection
|
||||||
|
|
||||||
|
@property
|
||||||
|
def collection(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
return self._collection
|
||||||
|
|||||||
@@ -6,40 +6,85 @@ 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)
|
_u_idx = defaultdict(lambda: 0)
|
||||||
|
|
||||||
def __bool__(self):
|
@property
|
||||||
return True
|
def bound_entity(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
return self._bound_entity
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def var_can_be_bound(self):
|
def var_can_be_bound(self) -> bool:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
Indicates if it is possible to bind this object to another Entity or Object.
|
||||||
|
|
||||||
|
:return: Whether this object can be bound.
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return self._collection.var_can_be_bound or False
|
return self._collection.var_can_be_bound or False
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def observers(self):
|
def observers(self) -> set:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self._observers
|
return self._observers
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return f'{self.__class__.__name__}[{self.identifier}]'
|
return f'{self.__class__.__name__}[{self.identifier}]'
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def identifier(self):
|
def identifier(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
if self._str_ident is not None:
|
if self._str_ident is not None:
|
||||||
return self._str_ident
|
return self._str_ident
|
||||||
else:
|
else:
|
||||||
return self.u_int
|
return self.u_int
|
||||||
|
|
||||||
def reset_uid(self):
|
def reset_uid(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self._u_idx = defaultdict(lambda: 0)
|
self._u_idx = defaultdict(lambda: 0)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def __init__(self, str_ident: Union[str, None] = None, **kwargs):
|
def __init__(self, str_ident: Union[str, None] = None, **kwargs):
|
||||||
|
"""
|
||||||
|
Generell Objects for Organisation and Maintanance such as Actions etc...
|
||||||
|
|
||||||
|
TODO
|
||||||
|
|
||||||
|
:param str_ident:
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self._status = None
|
self._status = None
|
||||||
self._bound_entity = None
|
self._bound_entity = None
|
||||||
self._observers = set()
|
self._observers = set()
|
||||||
@@ -50,6 +95,9 @@ class Object:
|
|||||||
if kwargs:
|
if kwargs:
|
||||||
print(f'Following kwargs were passed, but ignored: {kwargs}')
|
print(f'Following kwargs were passed, but ignored: {kwargs}')
|
||||||
|
|
||||||
|
def __bool__(self) -> bool:
|
||||||
|
return True
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
name = self.name
|
name = self.name
|
||||||
if self.bound_entity:
|
if self.bound_entity:
|
||||||
@@ -67,39 +115,61 @@ class Object:
|
|||||||
def __hash__(self):
|
def __hash__(self):
|
||||||
return hash(self.identifier)
|
return hash(self.identifier)
|
||||||
|
|
||||||
def _identify_and_count_up(self):
|
def _identify_and_count_up(self) -> int:
|
||||||
|
"""Internal Usage"""
|
||||||
idx = Object._u_idx[self.__class__.__name__]
|
idx = Object._u_idx[self.__class__.__name__]
|
||||||
Object._u_idx[self.__class__.__name__] += 1
|
Object._u_idx[self.__class__.__name__] += 1
|
||||||
return idx
|
return idx
|
||||||
|
|
||||||
def set_collection(self, collection):
|
def set_collection(self, collection):
|
||||||
|
"""Internal Usage"""
|
||||||
self._collection = collection
|
self._collection = collection
|
||||||
|
return self
|
||||||
|
|
||||||
def add_observer(self, observer):
|
def add_observer(self, observer):
|
||||||
|
"""Internal Usage"""
|
||||||
self.observers.add(observer)
|
self.observers.add(observer)
|
||||||
observer.notify_add_entity(self)
|
observer.notify_add_entity(self)
|
||||||
|
return self
|
||||||
|
|
||||||
def del_observer(self, observer):
|
def del_observer(self, observer):
|
||||||
|
"""Internal Usage"""
|
||||||
self.observers.remove(observer)
|
self.observers.remove(observer)
|
||||||
|
return self
|
||||||
|
|
||||||
def summarize_state(self):
|
def summarize_state(self):
|
||||||
return dict()
|
return dict()
|
||||||
|
|
||||||
def clear_temp_state(self):
|
def clear_temp_state(self):
|
||||||
|
"""Internal Usage"""
|
||||||
self._status = None
|
self._status = None
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def bind_to(self, entity):
|
def bind_to(self, entity):
|
||||||
# noinspection PyAttributeOutsideInit
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self._bound_entity = entity
|
self._bound_entity = entity
|
||||||
return c.VALID
|
return c.VALID
|
||||||
|
|
||||||
def belongs_to_entity(self, entity):
|
def belongs_to_entity(self, entity):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self._bound_entity == entity
|
return self._bound_entity == entity
|
||||||
|
|
||||||
@property
|
|
||||||
def bound_entity(self):
|
|
||||||
return self._bound_entity
|
|
||||||
|
|
||||||
def unbind(self):
|
def unbind(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
previously_bound = self._bound_entity
|
||||||
self._bound_entity = None
|
self._bound_entity = None
|
||||||
|
return previously_bound
|
||||||
|
|||||||
@@ -11,15 +11,33 @@ from marl_factory_grid.environment.entity.object import Object
|
|||||||
class PlaceHolder(Object):
|
class PlaceHolder(Object):
|
||||||
|
|
||||||
def __init__(self, *args, fill_value=0, **kwargs):
|
def __init__(self, *args, fill_value=0, **kwargs):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self._fill_value = fill_value
|
self._fill_value = fill_value
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def can_collide(self):
|
def var_can_collide(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def encoding(self):
|
def encoding(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self._fill_value
|
return self._fill_value
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -29,14 +47,30 @@ class PlaceHolder(Object):
|
|||||||
|
|
||||||
class GlobalPosition(Object):
|
class GlobalPosition(Object):
|
||||||
|
|
||||||
|
@property
|
||||||
|
def obs_tag(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def encoding(self):
|
def encoding(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
if self._normalized:
|
if self._normalized:
|
||||||
return tuple(np.divide(self._bound_entity.pos, self._shape))
|
return tuple(np.divide(self._bound_entity.pos, self._shape))
|
||||||
else:
|
else:
|
||||||
return self.bound_entity.pos
|
return self.bound_entity.pos
|
||||||
|
|
||||||
def __init__(self, agent, level_shape, *args, normalized: bool = True, **kwargs):
|
def __init__(self, agent, level_shape, *args, normalized: bool = True, **kwargs):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super(GlobalPosition, self).__init__(*args, **kwargs)
|
super(GlobalPosition, self).__init__(*args, **kwargs)
|
||||||
self.bind_to(agent)
|
self.bind_to(agent)
|
||||||
self._normalized = normalized
|
self._normalized = normalized
|
||||||
|
|||||||
@@ -6,6 +6,12 @@ from marl_factory_grid.utils.utility_classes import RenderEntity
|
|||||||
class Wall(Entity):
|
class Wall(Entity):
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@@ -23,22 +23,52 @@ class Factory(gym.Env):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def action_space(self):
|
def action_space(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.state[c.AGENT].action_space
|
return self.state[c.AGENT].action_space
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def named_action_space(self):
|
def named_action_space(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.state[c.AGENT].named_action_space
|
return self.state[c.AGENT].named_action_space
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def observation_space(self):
|
def observation_space(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.obs_builder.observation_space(self.state)
|
return self.obs_builder.observation_space(self.state)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def named_observation_space(self):
|
def named_observation_space(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.obs_builder.named_observation_space(self.state)
|
return self.obs_builder.named_observation_space(self.state)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def params(self) -> dict:
|
def params(self) -> dict:
|
||||||
|
"""
|
||||||
|
FIXME LAGEGY
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
import yaml
|
import yaml
|
||||||
config_path = Path(self._config_file)
|
config_path = Path(self._config_file)
|
||||||
config_dict = yaml.safe_load(config_path.open())
|
config_dict = yaml.safe_load(config_path.open())
|
||||||
@@ -49,6 +79,12 @@ class Factory(gym.Env):
|
|||||||
|
|
||||||
def __init__(self, config_file: Union[str, PathLike], custom_modules_path: Union[None, PathLike] = None,
|
def __init__(self, config_file: Union[str, PathLike], custom_modules_path: Union[None, PathLike] = None,
|
||||||
custom_level_path: Union[None, PathLike] = None):
|
custom_level_path: Union[None, PathLike] = None):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self._config_file = config_file
|
self._config_file = config_file
|
||||||
self.conf = FactoryConfigParser(self._config_file, custom_modules_path)
|
self.conf = FactoryConfigParser(self._config_file, custom_modules_path)
|
||||||
# Attribute Assignment
|
# Attribute Assignment
|
||||||
|
|||||||
@@ -26,12 +26,24 @@ class Agents(Collection):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def action_space(self):
|
def action_space(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
from gymnasium import spaces
|
from gymnasium import spaces
|
||||||
space = spaces.Tuple([spaces.Discrete(len(x.actions)) for x in self])
|
space = spaces.Tuple([spaces.Discrete(len(x.actions)) for x in self])
|
||||||
return space
|
return space
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def named_action_space(self):
|
def named_action_space(self) -> dict[str, dict[str, list[int]]]:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
named_space = dict()
|
named_space = dict()
|
||||||
for agent in self:
|
for agent in self:
|
||||||
named_space[agent.name] = {action.name: idx for idx, action in enumerate(agent.actions)}
|
named_space[agent.name] = {action.name: idx for idx, action in enumerate(agent.actions)}
|
||||||
|
|||||||
@@ -118,12 +118,6 @@ class Collection(Objects):
|
|||||||
except (StopIteration, AttributeError):
|
except (StopIteration, AttributeError):
|
||||||
return None
|
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
|
|
||||||
|
|
||||||
def render(self):
|
def render(self):
|
||||||
if self.var_has_position:
|
if self.var_has_position:
|
||||||
return [y for y in [x.render() for x in self] if y is not None]
|
return [y for y in [x.render() for x in self] if y is not None]
|
||||||
|
|||||||
@@ -28,9 +28,3 @@ class HasBoundMixin:
|
|||||||
return next((x for x in self if x.belongs_to_entity(entity)))
|
return next((x for x in self if x.belongs_to_entity(entity)))
|
||||||
except (StopIteration, AttributeError):
|
except (StopIteration, AttributeError):
|
||||||
return None
|
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
|
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ class Objects:
|
|||||||
|
|
||||||
def idx_by_entity(self, entity):
|
def idx_by_entity(self, entity):
|
||||||
try:
|
try:
|
||||||
return h.get_first_index(self, filter_by=lambda x: x.belongs_to_entity(entity))
|
return h.get_first_index(self, filter_by=lambda x: x == entity)
|
||||||
except (StopIteration, AttributeError):
|
except (StopIteration, AttributeError):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import List, Union
|
from typing import List, Union, Iterable
|
||||||
|
|
||||||
from marl_factory_grid.environment import constants as c
|
from marl_factory_grid.environment import constants as c
|
||||||
from marl_factory_grid.environment.entity.util import GlobalPosition
|
from marl_factory_grid.environment.entity.util import GlobalPosition
|
||||||
@@ -39,17 +39,36 @@ class GlobalPositions(Collection):
|
|||||||
|
|
||||||
_entity = GlobalPosition
|
_entity = GlobalPosition
|
||||||
|
|
||||||
var_is_blocking_light = False
|
@property
|
||||||
var_can_be_bound = True
|
def var_is_blocking_light(self):
|
||||||
var_can_collide = False
|
return False
|
||||||
var_has_position = False
|
|
||||||
|
@property
|
||||||
|
def var_has_position(self):
|
||||||
|
return False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def var_can_collide(self):
|
||||||
|
return False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def var_can_be_bound(self):
|
||||||
|
return True
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super(GlobalPositions, self).__init__(*args, **kwargs)
|
super(GlobalPositions, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
def spawn(self, agents, level_shape, *args, **kwargs):
|
def spawn(self, agents, level_shape, *args, **kwargs) -> list[Result]:
|
||||||
self.add_items([self._entity(agent, level_shape, *args, **kwargs) for agent in agents])
|
self.add_items([self._entity(agent, level_shape, *args, **kwargs) for agent in agents])
|
||||||
return [Result(identifier=f'{self.name}_spawn', validity=c.VALID, value=len(self))]
|
return [Result(identifier=f'{self.name}_spawn', validity=c.VALID, value=len(self))]
|
||||||
|
|
||||||
def trigger_spawn(self, state: Gamestate, *args, **kwargs) -> [Result]:
|
def trigger_spawn(self, state: Gamestate, *args, **kwargs) -> list[Result]:
|
||||||
return self.spawn(state[c.AGENT], state.lvl_shape, *args, **kwargs)
|
result = self.spawn(state[c.AGENT], state.lvl_shape, *args, **kwargs)
|
||||||
|
state.print(f'{len(self)} new {self.__class__.__name__} have been spawned for {[x for x in state[c.AGENT]]}')
|
||||||
|
return result
|
||||||
|
|||||||
@@ -12,44 +12,94 @@ class Rule(abc.ABC):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return self.__class__.__name__
|
return self.__class__.__name__
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f'{self.name}'
|
return f'{self.name}'
|
||||||
|
|
||||||
def on_init(self, state, lvl_map):
|
def on_init(self, state, lvl_map):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def on_reset(self, state) -> List[TickResult]:
|
def on_reset(self, state) -> List[TickResult]:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def tick_pre_step(self, state) -> List[TickResult]:
|
def tick_pre_step(self, state) -> List[TickResult]:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def tick_step(self, state) -> List[TickResult]:
|
def tick_step(self, state) -> List[TickResult]:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def tick_post_step(self, state) -> List[TickResult]:
|
def tick_post_step(self, state) -> List[TickResult]:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def on_check_done(self, state) -> List[DoneResult]:
|
def on_check_done(self, state) -> List[DoneResult]:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
class SpawnEntity(Rule):
|
class SpawnEntity(Rule):
|
||||||
|
|
||||||
@property
|
|
||||||
def _collection(self) -> Collection:
|
|
||||||
return Collection()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
return f'{self.__class__.__name__}({self.collection.name})'
|
return f'{self.__class__.__name__}({self.collection.name})'
|
||||||
|
|
||||||
def __init__(self, collection, coords_or_quantity, ignore_blocking=False):
|
def __init__(self, collection, coords_or_quantity, ignore_blocking=False):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.coords_or_quantity = coords_or_quantity
|
self.coords_or_quantity = coords_or_quantity
|
||||||
self.collection = collection
|
self.collection = collection
|
||||||
@@ -65,6 +115,12 @@ class SpawnEntity(Rule):
|
|||||||
class SpawnAgents(Rule):
|
class SpawnAgents(Rule):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__()
|
super().__init__()
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -91,6 +147,12 @@ class SpawnAgents(Rule):
|
|||||||
class DoneAtMaxStepsReached(Rule):
|
class DoneAtMaxStepsReached(Rule):
|
||||||
|
|
||||||
def __init__(self, max_steps: int = 500):
|
def __init__(self, max_steps: int = 500):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.max_steps = max_steps
|
self.max_steps = max_steps
|
||||||
|
|
||||||
@@ -103,6 +165,12 @@ class DoneAtMaxStepsReached(Rule):
|
|||||||
class AssignGlobalPositions(Rule):
|
class AssignGlobalPositions(Rule):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
def on_reset(self, state, lvl_map):
|
def on_reset(self, state, lvl_map):
|
||||||
@@ -116,6 +184,12 @@ class AssignGlobalPositions(Rule):
|
|||||||
class WatchCollisions(Rule):
|
class WatchCollisions(Rule):
|
||||||
|
|
||||||
def __init__(self, reward=r.COLLISION, done_at_collisions: bool = False, reward_at_done=r.COLLISION_DONE):
|
def __init__(self, reward=r.COLLISION, done_at_collisions: bool = False, reward_at_done=r.COLLISION_DONE):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.reward_at_done = reward_at_done
|
self.reward_at_done = reward_at_done
|
||||||
self.reward = reward
|
self.reward = reward
|
||||||
|
|||||||
@@ -12,10 +12,6 @@ class Batteries(Collection):
|
|||||||
var_has_position = False
|
var_has_position = False
|
||||||
var_can_be_bound = True
|
var_can_be_bound = True
|
||||||
|
|
||||||
@property
|
|
||||||
def obs_tag(self):
|
|
||||||
return self.__class__.__name__
|
|
||||||
|
|
||||||
def __init__(self, size, initial_charge_level: float=1.0, *args, **kwargs):
|
def __init__(self, size, initial_charge_level: float=1.0, *args, **kwargs):
|
||||||
super(Batteries, self).__init__(size, *args, **kwargs)
|
super(Batteries, self).__init__(size, *args, **kwargs)
|
||||||
self.initial_charge_level = initial_charge_level
|
self.initial_charge_level = initial_charge_level
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ class Door(Entity):
|
|||||||
def is_open(self):
|
def is_open(self):
|
||||||
return self._state == d.STATE_OPEN
|
return self._state == d.STATE_OPEN
|
||||||
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def time_to_close(self):
|
def time_to_close(self):
|
||||||
return self._time_to_close
|
return self._time_to_close
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class Doors(Collection):
|
|||||||
def tick_doors(self, state):
|
def tick_doors(self, state):
|
||||||
results = list()
|
results = list()
|
||||||
for door in self:
|
for door in self:
|
||||||
|
assert isinstance(door, Door)
|
||||||
tick_result = door.tick(state)
|
tick_result = door.tick(state)
|
||||||
if tick_result is not None:
|
if tick_result is not None:
|
||||||
results.append(tick_result)
|
results.append(tick_result)
|
||||||
@@ -26,4 +27,5 @@ class Doors(Collection):
|
|||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
for door in self:
|
for door in self:
|
||||||
|
assert isinstance(door, Door)
|
||||||
door.reset()
|
door.reset()
|
||||||
|
|||||||
@@ -56,6 +56,9 @@ class Inventory(IsBoundMixin, Collection):
|
|||||||
self._collection = None
|
self._collection = None
|
||||||
self.bind(agent)
|
self.bind(agent)
|
||||||
|
|
||||||
|
def __repr__(self):
|
||||||
|
return f'{self.__class__.__name__}#{self._bound_entity.name}({dict(self._data)})'
|
||||||
|
|
||||||
def summarize_states(self, **kwargs):
|
def summarize_states(self, **kwargs):
|
||||||
attr_dict = {key: val for key, val in self.__dict__.items() if not key.startswith('_') and key != 'data'}
|
attr_dict = {key: val for key, val in self.__dict__.items() if not key.startswith('_') and key != 'data'}
|
||||||
attr_dict.update(dict(items=[val.summarize_state(**kwargs) for key, val in self.items()]))
|
attr_dict.update(dict(items=[val.summarize_state(**kwargs) for key, val in self.items()]))
|
||||||
@@ -100,12 +103,6 @@ class Inventories(Objects):
|
|||||||
def trigger_spawn(self, state, *args, **kwargs) -> [Result]:
|
def trigger_spawn(self, state, *args, **kwargs) -> [Result]:
|
||||||
return self.spawn(state[c.AGENT], *args, **kwargs)
|
return self.spawn(state[c.AGENT], *args, **kwargs)
|
||||||
|
|
||||||
def idx_by_entity(self, entity):
|
|
||||||
try:
|
|
||||||
return next((idx for idx, inv in enumerate(self) if inv.belongs_to_entity(entity)))
|
|
||||||
except StopIteration:
|
|
||||||
return None
|
|
||||||
|
|
||||||
def by_entity(self, entity):
|
def by_entity(self, entity):
|
||||||
try:
|
try:
|
||||||
return next((inv for inv in self if inv.belongs_to_entity(entity)))
|
return next((inv for inv in self if inv.belongs_to_entity(entity)))
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ class AgentSingleZonePlacement(Rule):
|
|||||||
class IndividualDestinationZonePlacement(Rule):
|
class IndividualDestinationZonePlacement(Rule):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
raise NotImplementedError("This is rpetty new, and needs to be debugged, after the zones")
|
raise NotImplementedError("This is pretty new, and needs to be debugged, after the zones")
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
def on_reset(self, state):
|
def on_reset(self, state):
|
||||||
|
|||||||
@@ -249,4 +249,11 @@ def get_first(iterable: Iterable, filter_by: Callable[[any], bool] = lambda _: T
|
|||||||
|
|
||||||
|
|
||||||
def get_first_index(iterable: Iterable, filter_by: Callable[[any], bool] = lambda _: True):
|
def get_first_index(iterable: Iterable, filter_by: Callable[[any], bool] = lambda _: True):
|
||||||
|
"""
|
||||||
|
todo
|
||||||
|
|
||||||
|
:param iterable:
|
||||||
|
:param filter_by:
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
return next((idx for idx, x in enumerate(iterable) if filter_by(x)), None)
|
return next((idx for idx, x in enumerate(iterable) if filter_by(x)), None)
|
||||||
|
|||||||
@@ -18,12 +18,24 @@ class OBSBuilder(object):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def pomdp_d(self):
|
def pomdp_d(self):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
if self.pomdp_r:
|
if self.pomdp_r:
|
||||||
return (self.pomdp_r * 2) + 1
|
return (self.pomdp_r * 2) + 1
|
||||||
else:
|
else:
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
def __init__(self, level_shape: np.size, state: Gamestate, pomdp_r: int):
|
def __init__(self, level_shape: np.size, state: Gamestate, pomdp_r: int):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self.all_obs = dict()
|
self.all_obs = dict()
|
||||||
self.ray_caster = dict()
|
self.ray_caster = dict()
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,12 @@ from numba import njit
|
|||||||
|
|
||||||
class RayCaster:
|
class RayCaster:
|
||||||
def __init__(self, agent, pomdp_r, degs=360):
|
def __init__(self, agent, pomdp_r, degs=360):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self.agent = agent
|
self.agent = agent
|
||||||
self.pomdp_r = pomdp_r
|
self.pomdp_r = pomdp_r
|
||||||
self.n_rays = 100 # (self.pomdp_r + 1) * 8
|
self.n_rays = 100 # (self.pomdp_r + 1) * 8
|
||||||
|
|||||||
@@ -33,6 +33,12 @@ class Renderer:
|
|||||||
lvl_padded_shape: Union[Tuple[int, int], None] = None,
|
lvl_padded_shape: Union[Tuple[int, int], None] = None,
|
||||||
cell_size: int = 40, fps: int = 7, factor: float = 0.9,
|
cell_size: int = 40, fps: int = 7, factor: float = 0.9,
|
||||||
grid_lines: bool = True, view_radius: int = 2):
|
grid_lines: bool = True, view_radius: int = 2):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
# TODO: Customn_assets paths
|
# TODO: Customn_assets paths
|
||||||
self.grid_h, self.grid_w = lvl_shape
|
self.grid_h, self.grid_w = lvl_shape
|
||||||
self.lvl_padded_shape = lvl_padded_shape if lvl_padded_shape is not None else lvl_shape
|
self.lvl_padded_shape = lvl_padded_shape if lvl_padded_shape is not None else lvl_shape
|
||||||
|
|||||||
@@ -10,6 +10,12 @@ TYPES = [TYPE_VALUE, TYPE_REWARD]
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class InfoObject:
|
class InfoObject:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
identifier: str
|
identifier: str
|
||||||
val_type: str
|
val_type: str
|
||||||
value: Union[float, int]
|
value: Union[float, int]
|
||||||
@@ -17,6 +23,12 @@ class InfoObject:
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Result:
|
class Result:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
identifier: str
|
identifier: str
|
||||||
validity: bool
|
validity: bool
|
||||||
reward: Union[float, None] = None
|
reward: Union[float, None] = None
|
||||||
@@ -40,6 +52,17 @@ class Result:
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class TickResult(Result):
|
class TickResult(Result):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ActionResult(Result):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@@ -47,6 +70,11 @@ class TickResult(Result):
|
|||||||
class ActionResult(Result):
|
class ActionResult(Result):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class State(Result):
|
||||||
|
# TODO: change identifiert to action/last_action
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class DoneResult(Result):
|
class DoneResult(Result):
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ from marl_factory_grid.utils.results import Result, DoneResult
|
|||||||
|
|
||||||
class StepRules:
|
class StepRules:
|
||||||
def __init__(self, *args):
|
def __init__(self, *args):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
if args:
|
if args:
|
||||||
self.rules = list(args)
|
self.rules = list(args)
|
||||||
else:
|
else:
|
||||||
@@ -77,6 +83,12 @@ class Gamestate(object):
|
|||||||
return [y for x in self.entities for y in x if x.var_can_move]
|
return [y for x in self.entities for y in x if x.var_can_move]
|
||||||
|
|
||||||
def __init__(self, entities, agents_conf, rules: List[Rule], lvl_shape, env_seed=69, verbose=False):
|
def __init__(self, entities, agents_conf, rules: List[Rule], lvl_shape, env_seed=69, verbose=False):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self.lvl_shape = lvl_shape
|
self.lvl_shape = lvl_shape
|
||||||
self.entities = entities
|
self.entities = entities
|
||||||
self.curr_step = 0
|
self.curr_step = 0
|
||||||
|
|||||||
@@ -22,6 +22,12 @@ EXCLUDED = ['identifier', 'args', 'kwargs', 'Move', 'Agent', 'GlobalPosition
|
|||||||
class ConfigExplainer:
|
class ConfigExplainer:
|
||||||
|
|
||||||
def __init__(self, custom_path: Union[None, PathLike] = None):
|
def __init__(self, custom_path: Union[None, PathLike] = None):
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
self.base_path = Path(__file__).parent.parent.resolve()
|
self.base_path = Path(__file__).parent.parent.resolve()
|
||||||
self.custom_path = custom_path
|
self.custom_path = custom_path
|
||||||
self.searchspace = [ACTION, GENERAL, ENTITIES, OBSERVATIONS, RULES, ASSETS]
|
self.searchspace = [ACTION, GENERAL, ENTITIES, OBSERVATIONS, RULES, ASSETS]
|
||||||
|
|||||||
@@ -18,6 +18,12 @@ class MarlFrameStack(gym.ObservationWrapper):
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class RenderEntity:
|
class RenderEntity:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
name: str
|
name: str
|
||||||
pos: np.array
|
pos: np.array
|
||||||
value: float = 1
|
value: float = 1
|
||||||
@@ -30,6 +36,12 @@ class RenderEntity:
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Floor:
|
class Floor:
|
||||||
|
"""
|
||||||
|
TODO
|
||||||
|
|
||||||
|
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def encoding(self):
|
def encoding(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user