steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-05-22 23:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
332 Commits 9 Branches 0 Tags
Commit Graph

332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steffen Illium
06a5130b25 new rules, new spawn logic, small fixes, default and narrow corridor debugged 2023-11-09 17:50:20 +01:00
Steffen Illium
9b9c6e0385 Merge branch 'refactor_rename' into 'main' 
Refactor rename

See merge request mobile-ifi/fiks/EDYS!3
 2023-11-02 12:05:21 +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
acd545dc0e fixed observation, 
fixed observer reporting
 2023-10-30 17:27:30 +01:00
Chanumask
ea6634b187 added regex search for bound entitiy search 2023-10-30 15:03:18 +01:00
Steffen Illium
35a42d7d47 fixed lightmap 2023-10-30 11:36:12 +01:00
Steffen Illium
374a38971a fixed names and function, dirtspawn and item spawn 2023-10-30 11:11:35 +01:00
Steffen Illium
00391d2bec name not identifier 2023-10-30 10:11:34 +01:00
Steffen Illium
fbbf8d6f6e naming Functions 2023-10-30 10:08:40 +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
9420986230 random_testrun.py added as starting point and eval. setting for dev. 2023-10-24 13:40:45 +02:00
Steffen Illium
dc34b2ad84 Merge remote-tracking branch 'origin/main' 2023-10-24 13:37:43 +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
b1fe698d52 Merge branch 'main' into refactor_rename 2023-10-20 15:44:54 +02:00
Steffen Illium
b44e1d1c1e Update .gitlab-ci.yml file 2023-10-20 15:40:31 +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
Steffen Illium
c3a1cb0cfa Update .gitlab-ci.yml file 2023-10-20 15:32:29 +02:00
Chanumask
d3147b9ff6 WIP: collection, entities, objects 2023-10-20 15:11:35 +02:00
Steffen Illium
7a1d3f84f1 no more tiles no more floor 2023-10-20 14:36:23 +02:00
Chanumask
8d6dcd70ae WIP: object, entity rework 2023-10-19 17:25:31 +02:00
Steffen Illium
8709b093b8 Merge branch 'remove-tiles' 
# Conflicts:
#	marl_factory_grid/environment/actions.py
#	marl_factory_grid/environment/entity/entity.py
#	marl_factory_grid/environment/factory.py
#	marl_factory_grid/modules/batteries/rules.py
#	marl_factory_grid/modules/clean_up/groups.py
#	marl_factory_grid/modules/destinations/entitites.py
#	marl_factory_grid/modules/destinations/groups.py
#	marl_factory_grid/modules/destinations/rules.py
#	marl_factory_grid/modules/items/rules.py
#	marl_factory_grid/modules/maintenance/entities.py
#	marl_factory_grid/utils/config_parser.py
#	marl_factory_grid/utils/level_parser.py
#	marl_factory_grid/utils/states.py
 2023-10-17 14:03:59 +02:00
Chanumask
3677b7b7dc WIP: removing tiles 2023-10-16 11:06:51 +02:00
Steffen Illium
bd936234a7 Update README.md 2023-10-13 13:00:53 +02:00
Steffen Illium
60ffcbba98 Update README.md 2023-10-13 13:00:09 +02:00
Steffen Illium
66ab77862a Update README.md 2023-10-13 12:57:05 +02:00
Steffen Illium
f5c6317158 Remove BoundDestination Object 
New Variable 'var_can_be_bound'
Observations adjusted accordingly
 2023-10-12 17:14:32 +02:00
Steffen Illium
e326a95bf4 Redone the spawn procedute and destination objects 2023-10-11 16:36:48 +02:00
Steffen Illium
e64fa84ef1 Manual step and ticks for AOMAS 2023-10-10 12:07:30 +02:00
Chanumask
3bf3246aeb WIP: removing tiles 2023-09-26 10:35:41 +02:00
Steffen Illium
04af996232 DoneOnReach Rule added. 2023-09-01 14:00:08 +02:00
Steffen Illium
178cc70ed2 DoneOnReach Rule added. 2023-09-01 13:59:45 +02:00
Steffen Illium
714e07a816 New Szenario "Two_Rooms_One_Door" 2023-09-01 13:04:54 +02:00
Steffen Illium
fb0066d800 New Szenario "Two_Rooms_One_Door" 2023-07-12 15:59:51 +02:00
Steffen Illium
061934ed11 New Szenario "Two_Rooms_One_Door" 2023-07-12 15:59:28 +02:00
Steffen Illium
9135a69da6 New Szenario "Two_Rooms_One_Door" 2023-07-12 15:59:21 +02:00