|
|
3a7592b285
|
Merge branch 'main' into unit_testing
# Conflicts:
# marl_factory_grid/environment/factory.py
# marl_factory_grid/utils/states.py
|
2023-11-10 14:26:45 +01:00 |
|
|
|
9b289591ba
|
Maintainer and pos_dicts fixed. Are sets now.
|
2023-11-10 14:16:48 +01:00 |
|
|
|
789e9934fd
|
added test hooks (like rules)
|
2023-11-10 12:19:52 +01:00 |
|
|
|
209b317105
|
Merge branch 'main' into unit_testing
# Conflicts:
# marl_factory_grid/environment/factory.py
# marl_factory_grid/utils/config_parser.py
# marl_factory_grid/utils/states.py
|
2023-11-10 10:54:00 +01:00 |
|
|
|
3d18fe9839
|
added test hooks (like rules)
|
2023-11-10 10:43:11 +01:00 |
|
|
|
64c0d0e4e9
|
added test hooks (like rules)
|
2023-11-10 10:41:41 +01:00 |
|
|
|
6711a0976b
|
Resolved some warnings and style issues
|
2023-11-10 09:29:54 +01:00 |
|
|
|
a9462a8b6f
|
Added explanation for narrow_corridor.yaml
|
2023-11-10 06:54:38 +01:00 |
|
|
|
06a5130b25
|
new rules, new spawn logic, small fixes, default and narrow corridor debugged
|
2023-11-09 17:50:20 +01:00 |
|
|
|
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 |
|
|
|
4a8c12a5c3
|
fixed render funciton and obsbuilder
|
2023-11-02 12:02:03 +01:00 |
|
|
|
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 |
|
|
|
acd545dc0e
|
fixed observation,
fixed observer reporting
|
2023-10-30 17:27:30 +01:00 |
|
|
|
ea6634b187
|
added regex search for bound entitiy search
|
2023-10-30 15:03:18 +01:00 |
|
|
|
35a42d7d47
|
fixed lightmap
|
2023-10-30 11:36:12 +01:00 |
|
|
|
374a38971a
|
fixed names and function, dirtspawn and item spawn
|
2023-10-30 11:11:35 +01:00 |
|
|
|
00391d2bec
|
name not identifier
|
2023-10-30 10:11:34 +01:00 |
|
|
|
fbbf8d6f6e
|
naming Functions
|
2023-10-30 10:08:40 +01:00 |
|
|
|
115a79e930
|
fix mismatching signatures of spawn
|
2023-10-27 17:46:13 +02:00 |
|
|
|
dd5737e3ff
|
fixed default_config
|
2023-10-27 14:14:38 +02:00 |
|
|
|
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 |
|
|
|
b13dff925b
|
bugfixes
|
2023-10-27 13:08:01 +02:00 |
|
|
|
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 |
|
|
|
ce4108380f
|
Description and better naming scheme for the Destination-Module
|
2023-10-26 16:43:40 +02:00 |
|
|
|
20068e8e1b
|
Description and better naming scheme for the Door-Module
|
2023-10-26 16:12:19 +02:00 |
|
|
|
6011ba383e
|
Removed stale class DoneOnBreak in rules.py (machines)
|
2023-10-26 16:11:02 +02:00 |
|
|
|
e2e3da641e
|
Description and better naming scheme for the CleanUp/Dirt-Module
|
2023-10-26 16:10:08 +02:00 |
|
|
|
5e49b1228f
|
Moved Levels and fixed consta
|
2023-10-25 17:15:46 +02:00 |
|
|
|
85d65a2c78
|
Small adjustment and a not was missing rules
|
2023-10-25 17:01:58 +02:00 |
|
|
|
ef2fdd5d28
|
Merge branch 'main' into refactor_rename
|
2023-10-24 14:15:57 +02:00 |
|
|
|
9420986230
|
random_testrun.py added as starting point and eval. setting for dev.
|
2023-10-24 13:40:45 +02:00 |
|
|
|
dc34b2ad84
|
Merge remote-tracking branch 'origin/main'
|
2023-10-24 13:37:43 +02:00 |
|
|
|
bf88561e7c
|
small adjustments and "DestinationReachAny" as replacement for "DestinationDone"
|
2023-10-24 13:37:35 +02:00 |
|
|
|
0c1d0f510b
|
removed positionmix entirely (now also in collection)
|
2023-10-24 13:33:35 +02:00 |
|
|
|
c4ffdb4e44
|
object and objects are now private
|
2023-10-23 16:44:03 +02:00 |
|
|
|
e87bd3aaa0
|
all vars are properties, removed comments
|
2023-10-22 12:05:38 +02:00 |
|
|
|
b1fe698d52
|
Merge branch 'main' into refactor_rename
|
2023-10-20 15:44:54 +02:00 |
|
|
|
b44e1d1c1e
|
Update .gitlab-ci.yml file
|
2023-10-20 15:40:31 +02:00 |
|
|
|
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 |
|
|
|
0083f027d2
|
test new pipeline
|
2023-10-20 15:38:27 +02:00 |
|
|
|
c3a1cb0cfa
|
Update .gitlab-ci.yml file
|
2023-10-20 15:32:29 +02:00 |
|
|
|
d3147b9ff6
|
WIP: collection, entities, objects
|
2023-10-20 15:11:35 +02:00 |
|
|
|
7a1d3f84f1
|
no more tiles no more floor
|
2023-10-20 14:36:23 +02:00 |
|
|
|
8d6dcd70ae
|
WIP: object, entity rework
|
2023-10-19 17:25:31 +02:00 |
|
|
|
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 |
|
|
|
3677b7b7dc
|
WIP: removing tiles
|
2023-10-16 11:06:51 +02:00 |
|
|
|
bd936234a7
|
Update README.md
|
2023-10-13 13:00:53 +02:00 |
|
|
|
60ffcbba98
|
Update README.md
|
2023-10-13 13:00:09 +02:00 |
|
|
|
66ab77862a
|
Update README.md
|
2023-10-13 12:57:05 +02:00 |
|
|
|
f5c6317158
|
Remove BoundDestination Object
New Variable 'var_can_be_bound'
Observations adjusted accordingly
|
2023-10-12 17:14:32 +02:00 |
|
