Merge branch 'main' into refactor_rename

# Conflicts:
#	marl_factory_grid/configs/default_config.yaml
#	marl_factory_grid/environment/entity/object.py

marl_factory_grid/modules/batteries/__init__.py

@@ -1,4 +1,4 @@
 from .actions import BtryCharge
 from .entitites import Pod, Battery
 from .groups import ChargePods, Batteries
-from .rules import BtryDoneAtDischarge, BatteryDecharge
+from .rules import DoneAtBatteryDischarge, BatteryDecharge

marl_factory_grid/modules/batteries/rules.py

@@ -94,7 +94,7 @@ class BatteryDecharge(Rule):
         return results
 
 
-class BtryDoneAtDischarge(BatteryDecharge):
+class DoneAtBatteryDischarge(BatteryDecharge):
 
     def __init__(self, reward_discharge_done=b.REWARD_DISCHARGE_DONE, mode: str = b.SINGLE, **kwargs):
         f"""

marl_factory_grid/modules/clean_up/groups.py

@@ -45,6 +45,7 @@ class DirtPiles(Collection):
             if not self.amount > self.max_global_amount:
                 amount = amount_s[idx] if isinstance(amount_s, list) else amount_s
                 if dirt := self.by_pos(pos):
+                    dirt = next(dirt.iter())
                     new_value = dirt.amount + amount
                     dirt.set_new_amount(new_value)
                 else:
@@ -57,8 +58,8 @@ class DirtPiles(Collection):
         return Result(identifier=f'{self.name}_spawn', validity=c.VALID, reward=0, value=spawn_counter)
 
     def trigger_dirt_spawn(self, n, amount, state, n_var=0.2, amount_var=0.2) -> Result:
-        free_for_dirt = [x for x in state.entities.floorlist if len(state.entities.pos_dict[x]) == 1 or (
-                len(state.entities.pos_dict[x]) == 2 and isinstance(next(y for y in x), DirtPile))]
+        free_for_dirt = [x for x in state.entities.floorlist if len(state.entities.pos_dict[x]) == 0 or (
+                len(state.entities.pos_dict[x]) >= 1 and isinstance(next(y for y in x), DirtPile))]
         # free_for_dirt = [x for x in state[c.FLOOR]
         #                  if len(x.guests) == 0 or (
         #                          len(x.guests) == 1 and

marl_factory_grid/modules/clean_up/rules.py

@@ -27,7 +27,8 @@ class DoneOnAllDirtCleaned(Rule):
 
 class SpawnDirt(Rule):
 
-    def __init__(self, initial_n: int, initial_amount: float, respawn_n: int, respawn_amount: float,
+    def __init__(self, initial_n: int = 5, initial_amount: float = 1.3,
+                 respawn_n: int = 3, respawn_amount: float = 0.8,
                  n_var: float = 0.2, amount_var: float = 0.2, spawn_freq: int = 15):
         """
         Defines the spawn pattern of intial and additional 'Dirt'-entitites.

marl_factory_grid/modules/doors/__init__.py

@@ -1,4 +1,4 @@
 from .actions import DoorUse
 from .entitites import Door, DoorIndicator
 from .groups import Doors
-from .rules import DoDoorAutoClose, IndicateDoorAreaInObservation
+from .rules import DoorAutoClose, IndicateDoorAreaInObservation

marl_factory_grid/modules/doors/rules.py

@@ -5,7 +5,7 @@ from . import constants as d
 from .entitites import DoorIndicator
 
 
-class DoDoorAutoClose(Rule):
+class DoorAutoClose(Rule):
 
     def __init__(self, close_frequency: int = 10):
         """

marl_factory_grid/modules/items/groups.py

@@ -135,7 +135,7 @@ class DropOffLocations(Collection):
 
     @staticmethod
     def trigger_drop_off_location_spawn(state, n_locations):
-        empty_positions = state.entities.empty_positions()[:n_locations]
+        empty_positions = state.entities.empty_positions[:n_locations]
         do_entites = state[i.DROP_OFF]
         drop_offs = [DropOffLocation(pos) for pos in empty_positions]
         do_entites.add_items(drop_offs)