This commit is contained in:
Steffen Illium 2023-06-21 11:28:36 +02:00
parent 95c85bfedd
commit d11b1a8172
133 changed files with 225 additions and 225 deletions

View File

@ -80,27 +80,27 @@ General:
level_name: rooms # 'double', 'large', 'simple', ...
```
... or create your own , maybe with the help of [asciiflow.com](https://asciiflow.com/#/).
Make sure to use `#` as [Walls](mfg_package/environment/entity/wall_floor.py), `-` as free (walkable) [Floor](mfg_package/environment/entity/wall_floor.py)-Tiles, `D` for [Walls](./modules/doors/entities.py).
Make sure to use `#` as [Walls](marl_factory_grid/environment/entity/wall_floor.py), `-` as free (walkable) [Floor](marl_factory_grid/environment/entity/wall_floor.py)-Tiles, `D` for [Walls](./modules/doors/entities.py).
Other Entites (define you own) may bring their own `Symbols`
#### Entites
Entites, either [Objects](mfg_package/environment/entity/object.py) for tracking stats
or env. [Entity](mfg_package/environment/entity/entity.py) which can interact.
Entites, either [Objects](marl_factory_grid/environment/entity/object.py) for tracking stats
or env. [Entity](marl_factory_grid/environment/entity/entity.py) which can interact.
Abstract Entities are provided.
#### Groups
[Groups](mfg_package/environment/groups/objects.py) are entity Sets that provide administrative access to all group members.
All [Entites](mfg_package/environment/entity/global_entities.py) are available at runtime as EnvState property.
[Groups](marl_factory_grid/environment/groups/objects.py) are entity Sets that provide administrative access to all group members.
All [Entites](marl_factory_grid/environment/entity/global_entities.py) are available at runtime as EnvState property.
#### Rules
[Rules](mfg_package/environment/entity/object.py) define how the environment behaves on micro-scale.
[Rules](marl_factory_grid/environment/entity/object.py) define how the environment behaves on micro-scale.
Each of the hookes (`on_init`, `pre_step`, `on_step`, '`post_step`', `on_done`)
provide env-access to implement customn logic, calculate rewards, or gather information.
![Hooks](./images/Hooks_FIKS.png)
[Results](mfg_package/environment/entity/object.py) provide a way to return `rule` evaluations such as rewards and state reports
[Results](marl_factory_grid/environment/entity/object.py) provide a way to return `rule` evaluations such as rewards and state reports
back to the environment.
#### Assets
Make sure to bring your own assets for each Entity living in the Gridworl as the `Renderer` relies on it.

View File

@ -0,0 +1 @@
from marl_factory_grid.algorithms.marl.memory import MARLActorCriticMemory

View File

@ -2,8 +2,8 @@ import torch
from typing import Union, List, Dict
import numpy as np
from torch.distributions import Categorical
from mfg_package.algorithms.marl.memory import MARLActorCriticMemory
from mfg_package.algorithms.utils import add_env_props, instantiate_class
from marl_factory_grid.algorithms.marl.memory import MARLActorCriticMemory
from marl_factory_grid.algorithms.utils import add_env_props, instantiate_class
from pathlib import Path
import pandas as pd
from collections import deque

View File

@ -1,9 +1,9 @@
import torch
from mfg_package.algorithms.marl.base_ac import BaseActorCritic, nms
from mfg_package.algorithms.utils import instantiate_class
from marl_factory_grid.algorithms.marl.base_ac import BaseActorCritic, nms
from marl_factory_grid.algorithms.utils import instantiate_class
from pathlib import Path
from natsort import natsorted
from mfg_package.algorithms.marl.memory import MARLActorCriticMemory
from marl_factory_grid.algorithms.marl.memory import MARLActorCriticMemory
class LoopIAC(BaseActorCritic):

View File

@ -1,9 +1,9 @@
from mfg_package.algorithms.marl.base_ac import Names as nms
from mfg_package.algorithms.marl.snac import LoopSNAC
from mfg_package.algorithms.marl.memory import MARLActorCriticMemory
from marl_factory_grid.algorithms.marl.base_ac import Names as nms
from marl_factory_grid.algorithms.marl.snac import LoopSNAC
from marl_factory_grid.algorithms.marl.memory import MARLActorCriticMemory
import torch
from torch.distributions import Categorical
from mfg_package.algorithms.utils import instantiate_class
from marl_factory_grid.algorithms.utils import instantiate_class
class LoopMAPPO(LoopSNAC):

View File

@ -1,8 +1,8 @@
import torch
from torch.distributions import Categorical
from mfg_package.algorithms.marl.iac import LoopIAC
from mfg_package.algorithms.marl.base_ac import nms
from mfg_package.algorithms.marl.memory import MARLActorCriticMemory
from marl_factory_grid.algorithms.marl.iac import LoopIAC
from marl_factory_grid.algorithms.marl.base_ac import nms
from marl_factory_grid.algorithms.marl.memory import MARLActorCriticMemory
class LoopSEAC(LoopIAC):

View File

@ -1,5 +1,5 @@
from mfg_package.algorithms.marl.base_ac import BaseActorCritic
from mfg_package.algorithms.marl.base_ac import nms
from marl_factory_grid.algorithms.marl.base_ac import BaseActorCritic
from marl_factory_grid.algorithms.marl.base_ac import nms
import torch
from torch.distributions import Categorical
from pathlib import Path

View File

@ -6,9 +6,9 @@ import numpy as np
import networkx as nx
from networkx.algorithms.approximation import traveling_salesman as tsp
from mfg_package.modules.doors import constants as do
from mfg_package.environment import constants as c
from mfg_package.utils.helpers import MOVEMAP
from marl_factory_grid.modules.doors import constants as do
from marl_factory_grid.environment import constants as c
from marl_factory_grid.utils.helpers import MOVEMAP
from abc import abstractmethod, ABC

View File

@ -1,6 +1,6 @@
from mfg_package.algorithms.static.TSP_base_agent import TSPBaseAgent
from marl_factory_grid.algorithms.static.TSP_base_agent import TSPBaseAgent
from mfg_package.modules.clean_up import constants as di
from marl_factory_grid.modules.clean_up import constants as di
future_planning = 7

View File

@ -1,8 +1,8 @@
import numpy as np
from mfg_package.algorithms.static.TSP_base_agent import TSPBaseAgent
from marl_factory_grid.algorithms.static.TSP_base_agent import TSPBaseAgent
from mfg_package.modules.items import constants as i
from marl_factory_grid.modules.items import constants as i
future_planning = 7
inventory_size = 3

View File

@ -1,7 +1,7 @@
from mfg_package.algorithms.static.TSP_base_agent import TSPBaseAgent
from marl_factory_grid.algorithms.static.TSP_base_agent import TSPBaseAgent
from mfg_package.modules.destinations import constants as d
from mfg_package.modules.doors import constants as do
from marl_factory_grid.modules.destinations import constants as d
from marl_factory_grid.modules.doors import constants as do
future_planning = 7

View File

@ -1,6 +1,6 @@
from random import randint
from mfg_package.algorithms.static.TSP_base_agent import TSPBaseAgent
from marl_factory_grid.algorithms.static.TSP_base_agent import TSPBaseAgent
future_planning = 7

View File

@ -1,9 +1,9 @@
import abc
from typing import Union
from mfg_package.environment import rewards as r, constants as c
from mfg_package.utils.helpers import MOVEMAP
from mfg_package.utils.results import ActionResult
from marl_factory_grid.environment import rewards as r, constants as c
from marl_factory_grid.utils.helpers import MOVEMAP
from marl_factory_grid.utils.results import ActionResult
class Action(abc.ABC):

View File

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -1,12 +1,12 @@
from typing import List, Union
from mfg_package.environment import constants as c
from mfg_package.environment.actions import Action
from mfg_package.environment.entity.entity import Entity
from mfg_package.utils.render import RenderEntity
from mfg_package.utils import renderer
from mfg_package.utils.helpers import is_move
from mfg_package.utils.results import ActionResult, Result
from marl_factory_grid.environment import constants as c
from marl_factory_grid.environment.actions import Action
from marl_factory_grid.environment.entity.entity import Entity
from marl_factory_grid.utils.render import RenderEntity
from marl_factory_grid.utils import renderer
from marl_factory_grid.utils.helpers import is_move
from marl_factory_grid.utils.results import ActionResult, Result
class Agent(Entity):

View File

@ -1,8 +1,8 @@
import abc
from mfg_package.environment import constants as c
from mfg_package.environment.entity.object import EnvObject
from mfg_package.utils.render import RenderEntity
from marl_factory_grid.environment import constants as c
from marl_factory_grid.environment.entity.object import EnvObject
from marl_factory_grid.utils.render import RenderEntity
class Entity(EnvObject, abc.ABC):

View File

@ -1,7 +1,7 @@
from collections import defaultdict
from typing import Union
from mfg_package.environment import constants as c
from marl_factory_grid.environment import constants as c
class Object:

View File

@ -2,8 +2,8 @@ import math
import numpy as np
from mfg_package.environment.entity.mixin import BoundEntityMixin
from mfg_package.environment.entity.object import Object, EnvObject
from marl_factory_grid.environment.entity.mixin import BoundEntityMixin
from marl_factory_grid.environment.entity.object import Object, EnvObject
##########################################################################

View File

@ -2,10 +2,10 @@ from typing import List
import numpy as np
from mfg_package.environment import constants as c
from mfg_package.environment.entity.object import EnvObject
from mfg_package.utils.render import RenderEntity
from mfg_package.utils import helpers as h
from marl_factory_grid.environment import constants as c
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
class Floor(EnvObject):

View File

@ -8,13 +8,13 @@ from typing import Union
import gymnasium as gym
from mfg_package.utils.level_parser import LevelParser
from mfg_package.utils.observation_builder import OBSBuilder
from mfg_package.utils.config_parser import FactoryConfigParser
from mfg_package.utils import helpers as h
import mfg_package.environment.constants as c
from marl_factory_grid.utils.level_parser import LevelParser
from marl_factory_grid.utils.observation_builder import OBSBuilder
from marl_factory_grid.utils.config_parser import FactoryConfigParser
from marl_factory_grid.utils import helpers as h
import marl_factory_grid.environment.constants as c
from mfg_package.utils.states import Gamestate
from marl_factory_grid.utils.states import Gamestate
REC_TAC = 'rec_'
@ -171,7 +171,7 @@ class BaseFactory(gym.Env):
# noinspection PyGlobalUndefined
def render(self, mode='human'):
if not self._renderer: # lazy init
from mfg_package.utils.renderer import Renderer
from marl_factory_grid.utils.renderer import Renderer
global Renderer
self._renderer = Renderer(self.map.level_shape, view_radius=self.conf.pomdp_r, fps=10)

View File

@ -1,6 +1,6 @@
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.mixins import PositionMixin
from mfg_package.environment.entity.agent import Agent
from marl_factory_grid.environment.groups.env_objects import EnvObjects
from marl_factory_grid.environment.groups.mixins import PositionMixin
from marl_factory_grid.environment.entity.agent import Agent
class Agents(PositionMixin, EnvObjects):

View File

@ -1,5 +1,5 @@
from mfg_package.environment.groups.objects import Objects
from mfg_package.environment.entity.object import EnvObject
from marl_factory_grid.environment.groups.objects import Objects
from marl_factory_grid.environment.entity.object import EnvObject
class EnvObjects(Objects):

View File

@ -2,8 +2,8 @@ from collections import defaultdict
from operator import itemgetter
from typing import Dict
from mfg_package.environment.groups.objects import Objects
from mfg_package.utils.helpers import POS_MASK
from marl_factory_grid.environment.groups.objects import Objects
from marl_factory_grid.utils.helpers import POS_MASK
class Entities(Objects):

View File

@ -1,6 +1,6 @@
from mfg_package.environment import constants as c
from marl_factory_grid.environment import constants as c
from mfg_package.environment.entity.entity import Entity
from marl_factory_grid.environment.entity.entity import Entity
# noinspection PyUnresolvedReferences,PyTypeChecker,PyArgumentList

View File

@ -3,7 +3,7 @@ from typing import List
import numpy as np
from mfg_package.environment.entity.object import Object
from marl_factory_grid.environment.entity.object import Object
class Objects:

View File

@ -2,12 +2,12 @@ from typing import List, Union
import numpy as np
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.objects import Objects
from mfg_package.environment.groups.mixins import HasBoundedMixin, PositionMixin
from mfg_package.environment.entity.util import GlobalPosition
from mfg_package.utils import helpers as h
from mfg_package.environment import constants as c
from marl_factory_grid.environment.groups.env_objects import EnvObjects
from marl_factory_grid.environment.groups.objects import Objects
from marl_factory_grid.environment.groups.mixins import HasBoundedMixin, PositionMixin
from marl_factory_grid.environment.entity.util import GlobalPosition
from marl_factory_grid.utils import helpers as h
from marl_factory_grid.environment import constants as c
class Combined(PositionMixin, EnvObjects):

View File

@ -1,10 +1,10 @@
import random
from typing import List
from mfg_package.environment import constants as c
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.mixins import PositionMixin
from mfg_package.environment.entity.wall_floor import Wall, Floor
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.mixins import PositionMixin
from marl_factory_grid.environment.entity.wall_floor import Wall, Floor
class Walls(PositionMixin, EnvObjects):

View File

@ -1,8 +1,8 @@
import abc
from typing import List
from mfg_package.utils.results import TickResult, DoneResult
from mfg_package.environment import rewards as r, constants as c
from marl_factory_grid.utils.results import TickResult, DoneResult
from marl_factory_grid.environment import rewards as r, constants as c
class Rule(abc.ABC):

View File

@ -5,12 +5,12 @@ from typing import Union
from gymnasium import Wrapper
from mfg_package.utils.helpers import IGNORED_DF_COLUMNS
from mfg_package.environment.factory import REC_TAC
from marl_factory_grid.utils.helpers import IGNORED_DF_COLUMNS
from marl_factory_grid.environment.factory import REC_TAC
import pandas as pd
from mfg_package.plotting.compare_runs import plot_single_run
from marl_factory_grid.plotting.compare_runs import plot_single_run
class EnvMonitor(Wrapper):

View File

@ -10,7 +10,7 @@ from gymnasium import Wrapper
import numpy as np
import pandas as pd
from mfg_package.environment.factory import REC_TAC
from marl_factory_grid.environment.factory import REC_TAC
class EnvRecorder(Wrapper):

View File

@ -1,6 +1,6 @@
from typing import List
from mfg_package.environment.rules import Rule
from mfg_package.utils.results import TickResult, DoneResult
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.utils.results import TickResult, DoneResult
class TemplateRule(Rule):

View File

@ -1,10 +1,10 @@
from typing import Union
from mfg_package.environment.actions import Action
from mfg_package.utils.results import ActionResult
from marl_factory_grid.environment.actions import Action
from marl_factory_grid.utils.results import ActionResult
from mfg_package.modules.batteries import constants as b, rewards as r
from mfg_package.environment import constants as c
from marl_factory_grid.modules.batteries import constants as b, rewards as r
from marl_factory_grid.environment import constants as c
class BtryCharge(Action):

View File

@ -1,10 +1,10 @@
from mfg_package.environment.entity.mixin import BoundEntityMixin
from mfg_package.environment.entity.object import EnvObject
from mfg_package.environment.entity.entity import Entity
from mfg_package.environment import constants as c
from mfg_package.utils.render import RenderEntity
from marl_factory_grid.environment.entity.mixin import BoundEntityMixin
from marl_factory_grid.environment.entity.object import EnvObject
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
from mfg_package.modules.batteries import constants as b
from marl_factory_grid.modules.batteries import constants as b
class Battery(BoundEntityMixin, EnvObject):

View File

@ -1,6 +1,6 @@
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.mixins import PositionMixin, HasBoundedMixin
from mfg_package.modules.batteries.entitites import ChargePod, Battery
from marl_factory_grid.environment.groups.env_objects import EnvObjects
from marl_factory_grid.environment.groups.mixins import PositionMixin, HasBoundedMixin
from marl_factory_grid.modules.batteries.entitites import ChargePod, Battery
class Batteries(HasBoundedMixin, EnvObjects):

View File

@ -1,9 +1,9 @@
from typing import List, Union
from mfg_package.environment.rules import Rule
from mfg_package.utils.results import TickResult, DoneResult
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.utils.results import TickResult, DoneResult
from mfg_package.environment import constants as c
from mfg_package.modules.batteries import constants as b, rewards as r
from marl_factory_grid.environment import constants as c
from marl_factory_grid.modules.batteries import constants as b, rewards as r
class Btry(Rule):

View File

@ -1,11 +1,11 @@
from typing import Union
from mfg_package.environment.actions import Action
from mfg_package.utils.results import ActionResult
from marl_factory_grid.environment.actions import Action
from marl_factory_grid.utils.results import ActionResult
from mfg_package.modules.clean_up import constants as d, rewards as r
from marl_factory_grid.modules.clean_up import constants as d, rewards as r
from mfg_package.environment import constants as c
from marl_factory_grid.environment import constants as c
class CleanUp(Action):

View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -1,8 +1,8 @@
from numpy import random
from mfg_package.environment.entity.entity import Entity
from mfg_package.utils.render import RenderEntity
from mfg_package.modules.clean_up import constants as d
from marl_factory_grid.environment.entity.entity import Entity
from marl_factory_grid.utils.render import RenderEntity
from marl_factory_grid.modules.clean_up import constants as d
class DirtPile(Entity):

View File

@ -1,9 +1,9 @@
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.mixins import PositionMixin
from mfg_package.environment.entity.wall_floor import Floor
from mfg_package.modules.clean_up.entitites import DirtPile
from marl_factory_grid.environment.groups.env_objects import EnvObjects
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
from mfg_package.environment import constants as c
from marl_factory_grid.environment import constants as c
class DirtPiles(PositionMixin, EnvObjects):

View File

@ -1,7 +1,7 @@
from mfg_package.environment import constants as c
from mfg_package.environment.rules import Rule
from mfg_package.utils.results import DoneResult
from mfg_package.modules.clean_up import constants as d, rewards as r
from marl_factory_grid.environment import constants as c
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.utils.results import DoneResult
from marl_factory_grid.modules.clean_up import constants as d, rewards as r
class DirtAllCleanDone(Rule):

View File

@ -1,7 +1,7 @@
from mfg_package.environment.rules import Rule
from mfg_package.utils.results import TickResult
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.utils.results import TickResult
from mfg_package.modules.clean_up import constants as d
from marl_factory_grid.modules.clean_up import constants as d
class DirtRespawnRule(Rule):

View File

@ -1,9 +1,9 @@
from mfg_package.environment.rules import Rule
from mfg_package.utils.helpers import is_move
from mfg_package.utils.results import TickResult
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.utils.helpers import is_move
from marl_factory_grid.utils.results import TickResult
from mfg_package.environment import constants as c
from mfg_package.modules.clean_up import constants as d
from marl_factory_grid.environment import constants as c
from marl_factory_grid.modules.clean_up import constants as d
class DirtSmearOnMove(Rule):

View File

@ -1,10 +1,10 @@
from typing import Union
from mfg_package.environment.actions import Action
from mfg_package.utils.results import ActionResult
from marl_factory_grid.environment.actions import Action
from marl_factory_grid.utils.results import ActionResult
from mfg_package.modules.destinations import constants as d, rewards as r
from mfg_package.environment import constants as c
from marl_factory_grid.modules.destinations import constants as d, rewards as r
from marl_factory_grid.environment import constants as c
class DestAction(Action):

View File

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@ -1,10 +1,10 @@
from collections import defaultdict
from mfg_package.environment.entity.agent import Agent
from mfg_package.environment.entity.entity import Entity
from mfg_package.environment import constants as c
from mfg_package.utils.render import RenderEntity
from mfg_package.modules.destinations import constants as d
from marl_factory_grid.environment.entity.agent import Agent
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
from marl_factory_grid.modules.destinations import constants as d
class Destination(Entity):

View File

@ -1,6 +1,6 @@
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.mixins import PositionMixin
from mfg_package.modules.destinations.entitites import Destination
from marl_factory_grid.environment.groups.env_objects import EnvObjects
from marl_factory_grid.environment.groups.mixins import PositionMixin
from marl_factory_grid.modules.destinations.entitites import Destination
class Destinations(PositionMixin, EnvObjects):

View File

@ -1,10 +1,10 @@
from typing import List, Union
from mfg_package.environment.rules import Rule
from mfg_package.utils.results import TickResult, DoneResult
from mfg_package.environment import constants as c
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.utils.results import TickResult, DoneResult
from marl_factory_grid.environment import constants as c
from mfg_package.modules.destinations import constants as d, rewards as r
from mfg_package.modules.destinations.entitites import Destination
from marl_factory_grid.modules.destinations import constants as d, rewards as r
from marl_factory_grid.modules.destinations.entitites import Destination
class DestinationReach(Rule):

View File

@ -1,10 +1,10 @@
from typing import Union
from mfg_package.environment.actions import Action
from mfg_package.utils.results import ActionResult
from marl_factory_grid.environment.actions import Action
from marl_factory_grid.utils.results import ActionResult
from mfg_package.modules.doors import constants as d, rewards as r
from mfg_package.environment import constants as c
from marl_factory_grid.modules.doors import constants as d, rewards as r
from marl_factory_grid.environment import constants as c
class DoorUse(Action):

View File

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -1,8 +1,8 @@
from mfg_package.environment.entity.entity import Entity
from mfg_package.utils.render import RenderEntity
from mfg_package.environment import constants as c
from marl_factory_grid.environment.entity.entity import Entity
from marl_factory_grid.utils.render import RenderEntity
from marl_factory_grid.environment import constants as c
from mfg_package.modules.doors import constants as d
from marl_factory_grid.modules.doors import constants as d
class DoorIndicator(Entity):

View File

@ -1,9 +1,9 @@
from typing import Union
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.mixins import PositionMixin
from mfg_package.modules.doors import constants as d
from mfg_package.modules.doors.entitites import Door
from marl_factory_grid.environment.groups.env_objects import EnvObjects
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):

View File

@ -1,7 +1,7 @@
from mfg_package.environment.rules import Rule
from mfg_package.environment import constants as c
from mfg_package.utils.results import TickResult
from mfg_package.modules.doors import constants as d
from marl_factory_grid.environment.rules import Rule
from marl_factory_grid.environment import constants as c
from marl_factory_grid.utils.results import TickResult
from marl_factory_grid.modules.doors import constants as d
class DoorAutoClose(Rule):

View File

@ -1,10 +1,10 @@
from typing import Union
from mfg_package.environment.actions import Action
from mfg_package.utils.results import ActionResult
from marl_factory_grid.environment.actions import Action
from marl_factory_grid.utils.results import ActionResult
from mfg_package.modules.items import constants as i, rewards as r
from mfg_package.environment import constants as c
from marl_factory_grid.modules.items import constants as i, rewards as r
from marl_factory_grid.environment import constants as c
class ItemAction(Action):

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -1,9 +1,9 @@
from collections import deque
from mfg_package.environment.entity.entity import Entity
from mfg_package.environment import constants as c
from mfg_package.utils.render import RenderEntity
from mfg_package.modules.items import constants as i
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
from marl_factory_grid.modules.items import constants as i
class Item(Entity):

View File

@ -1,11 +1,11 @@
from typing import List
from mfg_package.environment.groups.env_objects import EnvObjects
from mfg_package.environment.groups.objects import Objects
from mfg_package.environment.groups.mixins import PositionMixin, IsBoundMixin, HasBoundedMixin
from mfg_package.environment.entity.wall_floor import Floor
from mfg_package.environment.entity.agent import Agent
from mfg_package.modules.items.entitites import Item, DropOffLocation
from marl_factory_grid.environment.groups.env_objects import EnvObjects
from marl_factory_grid.environment.groups.objects import Objects
from marl_factory_grid.environment.groups.mixins import PositionMixin, IsBoundMixin, HasBoundedMixin
from marl_factory_grid.environment.entity.wall_floor import Floor
from marl_factory_grid.environment.entity.agent import Agent
from marl_factory_grid.modules.items.entitites import Item, DropOffLocation
class Items(PositionMixin, EnvObjects):

Some files were not shown because too many files have changed in this diff Show More