Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add full action masking support, expand and refactor testing #227

Merged
merged 10 commits into from
Jul 20, 2023
Merged

Add full action masking support, expand and refactor testing #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b48bcbe
Added a compatibility to an obs with multiple informations in aec env
jimherefornonsense Jul 11, 2023
27b48bd
Fixed the returned obs in aec env only contains the modified obs's pr…
jimherefornonsense Jul 12, 2023
1a644fa
Fixed the returned obs_space in aec env only contains the modified pr…
jimherefornonsense Jul 12, 2023
8856cb3
Passed pre-commit
jimherefornonsense Jul 18, 2023
7816940
Add pettingzoo AEC API tests and adapt wrappers to all work with acti…
elliottower Jul 20, 2023
74a605c
Revert base_aec_wrapper changes
elliottower Jul 20, 2023
e1c7636
Try to fix broken isort line
elliottower Jul 20, 2023
05a9f39
Add show diff on failure pre-commit
elliottower Jul 20, 2023
45a1c8c
Fix isort issue from CI
elliottower Jul 20, 2023
22ae565
Fix broken test and add assert statements for obs action mask test
elliottower Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- run: python -m pip install pre-commit
- run: python -m pre_commit --version
- run: python -m pre_commit install
- run: python -m pre_commit run --all-files
- run: python -m pre_commit run --all-files --show-diff-on-failure
16 changes: 15 additions & 1 deletion supersuit/utils/obs_delay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,18 @@ def add(self, in_obs):
if len(self.obs_queue) > self.delay:
return self.obs_queue.popleft()
else:
return np.zeros_like(in_obs)
if isinstance(in_obs, np.ndarray):
return np.zeros_like(in_obs)
elif (
isinstance(in_obs, dict)
and "observation" in in_obs.keys()
and "action_mask" in in_obs.keys()
):
return {
"observation": np.zeros_like(in_obs["observation"]),
"action_mask": np.ones_like(in_obs["action_mask"]),
}
else:
raise TypeError(
"Observation must be of type np.ndarray or dictionary with keys 'observation' and 'action_mask'"
)
Loading