64 Commits

Author SHA1 Message Date
Friedrich, Joel
b3acb57b4e Merge branch 'main' into 'unit_testing'
# Conflicts:
#   marl_factory_grid/algorithms/static/TSP_dirt_agent.py
#   marl_factory_grid/utils/config_parser.py
2024-03-18 16:23:44 +01:00
Friedrich, Joel
65a93b256c Merge branch 'main' into 'documentation'
# Conflicts:
#   README.md
2024-02-14 14:04:52 +01:00
Joel Friedrich
944887aa2e finished documentation of modules for now. 2023-12-21 16:15:21 +01:00
Steffen Illium
e7933985cb spinx going book 2023-12-12 17:51:37 +01:00
Chanumask
24221f90d1 fixes 2023-12-01 11:51:15 +01:00
Steffen Illium
0e07e47d51 Zones Removed 2023-12-01 11:13:15 +01:00
Chanumask
ab9fb8cd08 Merge branch 'main' into unit_testing 2023-11-28 12:28:20 +01:00
Chanumask
c9ac92f044 Merge branch 'main' into documentation
# Conflicts:
#	marl_factory_grid/configs/default_config.yaml
#	marl_factory_grid/configs/eight_puzzle.yaml
#	random_testrun.py
2023-11-28 12:06:26 +01:00
Chanumask
6ce4226a20 documentation config files 2023-11-27 17:36:33 +01:00
Steffen Illium
803d0dae7f Multiple Fixes:
- Config Explainer
 - Rewards
 - Destination Reach Condition
 - Additional Step Callback
2023-11-24 14:43:49 +01:00
Steffen Illium
0ec260f6a2 initial n steps 2023-11-23 17:32:32 +01:00
Chanumask
ef440356e0 fixes to maintainer test 2023-11-23 15:28:47 +01:00
Chanumask
fcea1972a4 Merge branch 'main' into unit_testing
# Conflicts:
#	marl_factory_grid/modules/doors/groups.py
#	marl_factory_grid/utils/states.py
2023-11-23 12:58:12 +01:00
Chanumask
4c85cac50f maintainer test grabs temp state 2023-11-23 12:52:27 +01:00
Steffen Illium
2f29ef703c Verified Collision Checks and Rendering 2023-11-23 11:43:04 +01:00
Joel Friedrich
855f53b406 Documentation 2023-11-22 12:12:04 +01:00
Steffen Illium
604c0c6f57 Fixed agent observation and inventory init 2023-11-20 14:59:37 +01:00
Steffen Illium
467cc3f793 Comments, small bugfixes removed legacy elements 2023-11-17 12:27:03 +01:00
Chanumask
0f6ede3f1f Merge branch 'main' into unit_testing 2023-11-16 19:45:52 +01:00
Chanumask
26318a7b48 maintainer test 2023-11-16 19:45:25 +01:00
Steffen Illium
6b97710a7b Fixed Doors 2023-11-16 17:28:45 +01:00
Steffen Illium
67a3f3f342 Fixed Battery Charge 2023-11-16 17:16:22 +01:00
Steffen Illium
6c27aa8eaf Movement printing and Results, state, state reset. 2023-11-16 17:08:08 +01:00
Steffen Illium
c3c434a97e Results resolved. Small ADjustments 2023-11-16 15:29:07 +01:00
Steffen Illium
1dfeb7ae4a checked rule returns 2023-11-11 15:33:33 +01:00
Steffen Illium
80247cb56a eight puzzle now available, clones now available 2023-11-11 11:49:12 +01:00
Steffen Illium
b6ab6ab652 small error fixes reset sanity and self sanity almost lost 2023-11-10 17:40:27 +01:00
Steffen Illium
9b289591ba Maintainer and pos_dicts fixed. Are sets now. 2023-11-10 14:16:48 +01:00
Steffen Illium
6711a0976b Resolved some warnings and style issues 2023-11-10 09:29:54 +01:00
Steffen Illium
06a5130b25 new rules, new spawn logic, small fixes, default and narrow corridor debugged 2023-11-09 17:50:20 +01:00
Chanumask
4a8c12a5c3 fixed render funciton and obsbuilder 2023-11-02 12:02:03 +01:00
Chanumask
ee4d29d50b Merge branch 'main' into refactor_rename
# Conflicts:
#	marl_factory_grid/configs/default_config.yaml
#	marl_factory_grid/environment/entity/object.py
2023-10-31 10:28:25 +01:00
Steffen Illium
374a38971a fixed names and function, dirtspawn and item spawn 2023-10-30 11:11:35 +01:00
Chanumask
115a79e930 fix mismatching signatures of spawn 2023-10-27 17:46:13 +02:00
Chanumask
dd5737e3ff fixed default_config 2023-10-27 14:14:38 +02:00
Chanumask
0e5b18c812 Merge branch 'main' into refactor_rename
# Conflicts:
#	marl_factory_grid/modules/clean_up/groups.py
#	marl_factory_grid/modules/clean_up/rules.py
#	marl_factory_grid/modules/destinations/rules.py
2023-10-27 13:12:54 +02:00
Chanumask
b13dff925b bugfixes 2023-10-27 13:08:01 +02:00
Steffen Illium
ac557232a1 Description and better naming scheme for the Battery-Module
plus: Agent are not able to move, when discharged.
2023-10-26 17:40:43 +02:00
Steffen Illium
ce4108380f Description and better naming scheme for the Destination-Module 2023-10-26 16:43:40 +02:00
Steffen Illium
20068e8e1b Description and better naming scheme for the Door-Module 2023-10-26 16:12:19 +02:00
Steffen Illium
6011ba383e Removed stale class DoneOnBreak in rules.py (machines) 2023-10-26 16:11:02 +02:00
Steffen Illium
e2e3da641e Description and better naming scheme for the CleanUp/Dirt-Module 2023-10-26 16:10:08 +02:00
Steffen Illium
5e49b1228f Moved Levels and fixed consta 2023-10-25 17:15:46 +02:00
Steffen Illium
85d65a2c78 Small adjustment and a not was missing rules 2023-10-25 17:01:58 +02:00
Chanumask
ef2fdd5d28 Merge branch 'main' into refactor_rename 2023-10-24 14:15:57 +02:00
Steffen Illium
bf88561e7c small adjustments and "DestinationReachAny" as replacement for "DestinationDone" 2023-10-24 13:37:35 +02:00
Chanumask
0c1d0f510b removed positionmix entirely (now also in collection) 2023-10-24 13:33:35 +02:00
Chanumask
c4ffdb4e44 object and objects are now private 2023-10-23 16:44:03 +02:00
Chanumask
e87bd3aaa0 all vars are properties, removed comments 2023-10-22 12:05:38 +02:00
Chanumask
161d04d15c Merge branch 'main' into refactor_rename
# Conflicts:
#	marl_factory_grid/environment/entity/entity.py
#	marl_factory_grid/modules/destinations/entitites.py
#	marl_factory_grid/modules/doors/entitites.py
#	marl_factory_grid/modules/items/groups.py
2023-10-20 15:39:01 +02:00