Commit Graph

55 Commits

Author SHA1 Message Date
Marek Wolan
96549e68aa Merge remote-tracking branch 'origin/dev' into 4.0.0-dev 2025-02-10 14:39:28 +00:00
Marek Wolan
504f4bd134 #2869 - Refactor agent and action config system 2025-01-16 15:17:42 +00:00
Charlie Crane
7af9d3724f #2869 - Updates to address test failures. Updated YAML configs to remove redundant start_settings 2025-01-08 14:42:35 +00:00
Marek Wolan
bf32271ddd Change copyright to 2025 2025-01-02 15:05:06 +00:00
Nick Todd
3441dd2509 #2777: Code review changes. 2024-08-05 17:45:01 +01:00
Nick Todd
966542c2ca #2777: Add determinism to torch backends when seed set. 2024-08-05 15:08:31 +01:00
Nick Todd
5dcc0189a0 #2777: Implementation of RNG seed 2024-08-02 11:30:45 +01:00
Marek Wolan
faf268a9b9 2623 move action mask generation to game and fix MARL masking 2024-07-09 15:59:50 +01:00
Marek Wolan
5367f9ad53 2623 Ray single agent action masking 2024-07-09 15:27:03 +01:00
Marek Wolan
470fa28ee1 2623 Implement basic action masking logic 2024-07-09 13:13:13 +01:00
Marek Wolan
28dabad66b #2682 Backport changes to core PrimAITE 2024-06-25 11:04:52 +01:00
Marek Wolan
fad8d936e6 Merge remote-tracking branch 'origin/dev' into feature/2646_Update-pre-commit-to-check-for-valid-copyright 2024-06-13 12:52:09 +01:00
Marek Wolan
c538aee022 Rename benchmark variables and add h1 to notebooks 2024-06-10 12:58:07 +01:00
Chris McCarthy
81bcf99855 #2646 - Added a custom pre-commit hook that ensure the copyright clause is added to .py and .rst files. 2024-06-05 09:11:37 +01:00
Czar Echavez
472040aa70 Merge remote-tracking branch 'origin/dev' into feature/2628-update-benchmarking-script-branched 2024-06-01 00:20:21 +01:00
Marek Wolan
53f01ca1e1 Merged PR 395: Fix reward logging and get ray to stop complaining
## Summary
Change the agent history log to also spit out rewards correctly.
Make ray adhere to new ray API

## Test process
Unit test pass
All notebooks run without crash

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [x] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [x] ran **pre-commit** checks for code style
- [x] attended to any **TO-DOs** left in the code
2024-05-31 14:38:05 +00:00
Marek Wolan
c5f131ece5 fix reward logging 2024-05-31 15:00:18 +01:00
Czar Echavez
add8cc0ab1 #2628: temp commit 2024-05-31 13:47:02 +01:00
Marek Wolan
f8336d07bd #2626 fix too many open files bug 2024-05-31 13:28:56 +01:00
Marek Wolan
c7b2ed7f86 Merge branch 'dev' into feature/2588-minimal-deps 2024-05-31 12:11:16 +01:00
Marek Wolan
a161a3a5ec #2639 Fix reset signature 2024-05-30 15:34:46 +01:00
Marek Wolan
0c19546322 #2588 optional RL deps 2024-05-29 14:54:45 +01:00
Charlie Crane
9b3699389a #2523 - Adding in some additional logging for other agent classes. This currently prints total_reward instead of average reward 2024-04-30 15:36:59 +01:00
Charlie Crane
b8c46a92e9 #2523 - Minor typos/corrections to make things run locally. Added one logging line to record Blue agent reward per step in environment.py 2024-04-30 14:16:29 +01:00
Marek Wolan
66f31e8ed1 #2476 Add test for episode scheduler 2024-04-25 15:09:46 +01:00
Marek Wolan
28c8b7c9d9 #2476 Get episode schedule working 2024-04-23 11:51:50 +01:00
Marek Wolan
8d0d323e0b #2374 Remove primaite session 2024-04-16 11:26:17 +01:00
Marek Wolan
0828f70b4c #2459 back-sync b8 changes into core 2024-04-15 11:50:08 +01:00
Marek Wolan
82143a2a2e #2446 Fix io config parsing order 2024-04-02 00:31:06 +01:00
Marek Wolan
b4d310eda2 Align step counts in logging 2024-03-15 16:17:38 +00:00
Marek Wolan
d33c80d0d6 Minor fixes 2024-03-14 14:33:04 +00:00
Marek Wolan
7599655879 Add agent action history 2024-03-11 20:10:08 +00:00
Marek Wolan
8589ce449a Merged PR 295: Agent action logging
## Summary
Added a new optional capability to create a JSON log each episode with a list of action each agent took each step (including scripted, RL, and red agents).

Also I had to slightly refactor the IO system to not rely on PrimaiteSession, as it's gonna be deprecated soon. Therefore the IO module is now linked to the gym environment. Each time you init a gym environment, it creates a session directory.

## Test process
Tried the SB3, Ray SARL and Ray MARL notebooks to see that the outputs get generated.

## Checklist
- [x] PR is linked to a **work item**
- [x] **acceptance criteria** of linked ticket are met
- [x] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [x] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [x] updated the **change log**
- [x] ran **pre-commit** checks for code style
- [x] attended to any **TO-DOs** left in the code

Move IO to environments from session and add agent logging

Related work items: #2278
2024-03-05 16:39:44 +00:00
Marek Wolan
758f892b74 Make notebook for varying red agent behaviour in uc2 2024-03-04 21:04:27 +00:00
Marek Wolan
2f456e7ae0 Move IO to environments from session and add agent logging 2024-03-04 18:47:50 +00:00
Marek Wolan
2f3e40fb6b Fix issue around reset 2024-02-29 13:22:05 +00:00
Marek Wolan
e5982c4599 Change agents list in game object to dictionary 2024-02-26 10:26:28 +00:00
Marek Wolan
994dbc3501 Finalise the refactor. It works well now. 2024-02-25 17:44:41 +00:00
Marek Wolan
64b9ba3ecf Make environment reset reinstantiate the game 2024-02-20 16:21:03 +00:00
Marek Wolan
28acb5dcae Populate step info in environment, and finish notebook 2024-01-25 12:04:09 +00:00
Marek Wolan
1505d08721 Fix backup issues and align with Yak 2024-01-10 18:04:48 +00:00
Marek Wolan
f75c10aafb Make flattening observation spaces optional. 2024-01-05 13:10:49 +00:00
Marek Wolan
01b9e661ce Clean up print statements. 2023-12-04 10:45:33 +00:00
Marek Wolan
a5c4f7797d Make saving step metadata optional 2023-12-04 10:42:20 +00:00
Marek Wolan
8ea9db2d34 Merge remote-tracking branch 'origin/dev' into feature/2085-dump_describe_state 2023-12-04 10:38:41 +00:00
Chris McCarthy
cc04efb31d #2085 - Added step metadata json file dumps to the environments. Fixed serialization issues in the Switch and ACLRule classes. 2023-12-01 16:37:58 +00:00
Chris McCarthy
32c13e06f6 Merge remote-tracking branch 'devops/bugfix/episode-length-and-rewards' into feature/2085-dump_describe_state 2023-12-01 15:58:32 +00:00
Marek Wolan
3e3fd89618 Minor string fix 2023-12-01 15:41:10 +00:00
Marek Wolan
eeedea2eff Make more friendly user outputs when training SB3 2023-12-01 15:36:07 +00:00
Marek Wolan
321d1f7219 Fix rllib marl problems 2023-12-01 14:58:34 +00:00