steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2026-07-15 23:31:52 +02:00
Code Projects Activity
354 Commits 9 Branches 0 Tags
0aa7afbe7ef3835fc16739a61401089176a509c3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steffen Illium 0aa7afbe7e Merge remote-tracking branch 'origin/main' 2023-11-22 12:34:31 +01:00
Steffen Illium d8a0756d34 Some Dokumentation (tools.py) 2023-11-22 12:34:16 +01:00
Steffen Illium 72a619fde4 Merge branch 'documentation' into 'main' 
Documentation

See merge request mobile-ifi/fiks/EDYS!4
 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
Steffen Illium fea327861e moved aftermath collision check to action 2023-11-17 10:36:02 +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 7f1d99fe18 Merge branch 'pypi' 2023-11-16 15:32:42 +01:00
Steffen Illium c3c434a97e Results resolved. Small ADjustments 2023-11-16 15:29:07 +01:00
Steffen Illium c17da78440 Update .gitlab-ci.yml file 2023-11-11 16:04:55 +01:00
Steffen Illium 93bc859161 Update .gitlab-ci.yml file 2023-11-11 16:00:29 +01:00
Steffen Illium cb76972a5f Merge remote-tracking branch 'origin/pypi' into pypi 
# Conflicts:
#	marl_factory_grid/environment/groups/mixins.py
#	setup.py
 2023-11-11 15:37:04 +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 a9462a8b6f Added explanation for narrow_corridor.yaml 2023-11-10 06:54:38 +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
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
Steffen Illium acd545dc0e fixed observation, 
fixed observer reporting
 2023-10-30 17:27:30 +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
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
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
Steffen Illium b44e1d1c1e Update .gitlab-ci.yml file 2023-10-20 15:40:31 +02:00
Steffen Illium 0083f027d2 test new pipeline 2023-10-20 15:38:27 +02:00
Steffen Illium c3a1cb0cfa Update .gitlab-ci.yml file 2023-10-20 15:32:29 +02:00
Steffen Illium 7a1d3f84f1 no more tiles no more floor 2023-10-20 14:36:23 +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
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
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
Steffen Illium 836495a884 Machines 2023-07-06 12:01:25 +02:00
Steffen Illium dc134d71e0 paths... II 2023-06-21 13:08:32 +02:00
Steffen Illium 3696577455 paths... II 2023-06-21 13:07:05 +02:00
Steffen Illium 98419df9e6 paths... 2023-06-21 11:42:39 +02:00
Steffen Illium a7906203d8 init and __init__ 2023-06-21 11:39:46 +02:00
Steffen Illium d11b1a8172 renaming 2023-06-21 11:28:36 +02:00
Steffen Illium 95c85bfedd version number up 2023-06-20 18:24:41 +02:00
Steffen Illium c7d77acbbe refactoring and init.py 2023-06-20 18:21:43 +02:00
Steffen Illium 1332cee7e1 CI/CD integration and auto-build for pypi 2023-06-20 10:27:24 +02:00
Steffen Illium 2c0351135d Update .gitlab-ci.yml file 2023-06-19 16:32:30 +02:00
Steffen Illium bbe5856e90 Update .gitlab-ci.yml file 2023-06-19 16:29:40 +02:00
Steffen Illium 36b60b5ba9 Update .gitlab-ci.yml file 2023-06-19 16:27:59 +02:00
Steffen Illium a660fc5687 Update .gitlab-ci.yml file 2023-06-19 16:25:54 +02:00
Steffen Illium d4164ed34f Update .gitlab-ci.yml file 2023-06-19 16:24:01 +02:00
Steffen Illium 7e7dbf75ca Update .gitlab-ci.yml file 2023-06-19 16:22:49 +02:00
Steffen Illium 33a1765579 Update .gitlab-ci.yml file 2023-06-19 16:19:13 +02:00
Steffen Illium 79b909f0a7 Update .gitlab-ci.yml file 2023-06-19 14:00:20 +02:00
Steffen Illium bfaa15fe7e Update .gitlab-ci.yml file 2023-06-19 13:58:48 +02:00
Steffen Illium 203a0bb067 Delete .gitlab-ci.yml 2023-06-19 13:55:49 +02:00
Steffen Illium 645e916f30 CI/CD integration and auto-build for pypi 2023-06-19 13:49:21 +02:00
Steffen Illium 5ddf1ae008 Update .gitlab-ci.yml file 2023-06-19 10:47:53 +02:00
Steffen Illium 5cd93dcf8e Update .gitlab-ci.yml file 2023-06-19 10:46:25 +02:00
Steffen Illium 8d7ce7e06b CI/CD integration and auto-build for pypi 2023-06-19 10:44:08 +02:00
Steffen Illium bf3e1e2ea4 README.md Updated 2023-06-16 14:42:54 +02:00
Steffen Illium b4326b514c Doors now Working, 
Pypi install adjustments.
 2023-06-16 09:58:28 +02:00
Steffen Illium 45cb83746c Merge remote-tracking branch 'origin/main' 2023-06-09 14:04:35 +02:00
Steffen Illium c552c35f66 major redesign ob observations and entittes 2023-06-09 14:04:17 +02:00
Steffen Illium f54511bcd5 markdown refreshed 2023-06-06 12:30:45 +02:00
Steffen Illium ad77808c42 Add new file 2023-06-06 12:10:08 +02:00
Steffen Illium 901fbcbc32 adjustments 2023-05-08 10:54:13 +02:00
Steffen Illium e09aa2f131 Merge remote-tracking branch 'origin/main' 2023-05-08 10:26:27 +02:00
Steffen Illium a08ae73656 Doors are now seperate 2023-05-08 10:26:05 +02:00
Steffen Illium 6c2df735d4 recorder fixed 2022-12-15 13:28:22 +01:00
Steffen Illium 4f3924d3ab recorder fixed 2022-08-18 16:15:17 +02:00
Steffen Illium 6a24e7b518 Adjustments and Documentation, recording and new environments, refactoring 2022-08-04 14:57:48 +02:00
Steffen Illium e7461d7dcf Adjustments and Documentation 2022-05-03 11:32:19 +02:00
Steffen Illium 33f144fc93 Merge remote-tracking branch 'origin/main' 2022-04-11 16:15:55 +02:00
Steffen Illium 0218f8f4e9 Adjustments and Documentation 2022-04-11 16:15:44 +02:00
Steffen Illium 3e19970a60 Door Parameter Assertion 2022-01-18 13:52:59 +01:00
Steffen Illium 51fb73ebb8 Fixed Parameter 2022-01-18 13:10:04 +01:00
Steffen Illium a16d7e709e Door Area Indicators 2022-01-18 11:39:19 +01:00
Steffen Illium 3ce6302e8a Rewards can now be set as parameter 2022-01-17 11:21:07 +01:00
Steffen Illium 823aa075b9 Experiments look good 2022-01-15 12:37:58 +01:00
Steffen Illium d29ccbbb71 Fixed Global Positions 2022-01-11 18:00:24 +01:00
Steffen Illium 2a2aafa988 Debugging 2022-01-11 16:27:34 +01:00
Steffen Illium 0e8a4af740 Debugging 2022-01-11 14:27:08 +01:00