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

Jump to bottom

Truncation Update #767

Merged
merged 75 commits into from
Sep 18, 2022
Merged

Truncation Update #767

Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
45a58a4
truncation update for atari env
jjshoots Aug 12, 2022
940772a
convert dones to terminations&truncations
WillDudley Aug 13, 2022
198144e
modifications so that mpe passes tests
WillDudley Aug 13, 2022
5c3be1d
!2 Bugs ignored! modifications so that mpe passes ALL tests
WillDudley Aug 13, 2022
b25427c
pre-commit
WillDudley Aug 14, 2022
ffe58c3
Merge pull request #758 from jjshoots/master
jjshoots Aug 15, 2022
d2b05ac
docstrings
WillDudley Aug 15, 2022
6fd245e
rename dones -> terminations
jjshoots Aug 16, 2022
7685996
add truncation to magent env
jjshoots Aug 16, 2022
05a406b
fixed merging of termination and truncation as dict items objects
WillDudley Aug 16, 2022
85910e0
fixed merging of termination and truncation as lists
WillDudley Aug 16, 2022
1ab4065
fixed merging of termination and truncation
WillDudley Aug 16, 2022
2edb96e
docstring fix
WillDudley Aug 16, 2022
a69a5f1
Merge remote-tracking branch 'fork/API_Update_mpe' into API_Update_mpe
WillDudley Aug 16, 2022
74c1658
Truncation Update for butterfly envs
FilipinoGambino Aug 17, 2022
64d389a
Reverting chained inequalities back since they don't work like I'd ho…
FilipinoGambino Aug 17, 2022
796f9b0
Reverting inequalities back
FilipinoGambino Aug 17, 2022
f0c4e4d
uncomment a previously-broken assertion
WillDudley Aug 17, 2022
bfc081c
simplification/refactor
WillDudley Aug 17, 2022
b4e6bb9
uncomment assertion which now works as expected
WillDudley Aug 17, 2022
c72fbdb
docstring
WillDudley Aug 17, 2022
fb41887
Merge pull request #761 from WillDudley/API_Update_mpe
jjshoots Aug 17, 2022
5f28d26
Merge branch 'Farama-Foundation:master' into temp_API_Update
jjshoots Aug 18, 2022
e2a1684
convert dones to terminations&truncations
WillDudley Aug 13, 2022
34dad66
modifications so that mpe passes tests
WillDudley Aug 13, 2022
7e7f9b1
!2 Bugs ignored! modifications so that mpe passes ALL tests
WillDudley Aug 13, 2022
1917d17
pre-commit
WillDudley Aug 14, 2022
978508d
fixed merging of termination and truncation as dict items objects
WillDudley Aug 16, 2022
2fe1114
fixed merging of termination and truncation as lists
WillDudley Aug 16, 2022
24afc1c
fixed merging of termination and truncation
WillDudley Aug 16, 2022
f9bb98e
docstring fix
WillDudley Aug 16, 2022
b6eaa8d
docstrings
WillDudley Aug 15, 2022
8f737e9
uncomment a previously-broken assertion
WillDudley Aug 17, 2022
d1ee9c8
simplification/refactor
WillDudley Aug 17, 2022
ab597dc
uncomment assertion which now works as expected
WillDudley Aug 17, 2022
24b1606
docstring
WillDudley Aug 17, 2022
06009de
truncation API fix for MPE
jjshoots Aug 18, 2022
5124eaf
black
jjshoots Aug 18, 2022
31ca1fa
remove truncations from was_done_step
jjshoots Aug 18, 2022
727f3d7
refactor for clarity that self._was_dead_step() doesn't return anything
WillDudley Aug 18, 2022
2c984ff
simplification/refactor
WillDudley Aug 18, 2022
b5415ae
Merge pull request #1 from WillDudley/temp_API_Update
jjshoots Aug 19, 2022
132dcf7
Merge pull request #765 from FilipinoGambino/API_Update_butterfly
jjshoots Aug 19, 2022
212baa0
Truncation Update for butterfly envs
FilipinoGambino Aug 17, 2022
9a880cf
Reverting chained inequalities back since they don't work like I'd ho…
FilipinoGambino Aug 17, 2022
113890c
Reverting inequalities back
FilipinoGambino Aug 17, 2022
c39379f
fix remaining things in butterfly envs
jjshoots Aug 19, 2022
315aedc
fix remaining things in sisl envs
jjshoots Aug 19, 2022
084b32d
Merge branch 'API_Update' into temp_API_Update
jjshoots Aug 19, 2022
306dbe9
Merge pull request #768 from jjshoots/temp_API_Update
jjshoots Aug 19, 2022
1023707
black
jjshoots Aug 19, 2022
5dc7539
Merge pull request #770 from jjshoots/temp_API_Update
jjshoots Aug 19, 2022
03cfa1f
update docs test
jjshoots Aug 19, 2022
1fd0b69
fix order enforcing wrapper and test
jjshoots Aug 19, 2022
b7d2ee0
Merge pull request #771 from jjshoots/temp_API_Update
jjshoots Aug 19, 2022
85a8129
black
jjshoots Aug 19, 2022
4426cda
Merge pull request #772 from jjshoots/temp_API_Update
jjshoots Aug 19, 2022
46af9a0
Classic Envs Update
reginald-mclean Aug 22, 2022
cbf86b0
cleaning up missed conversions
reginald-mclean Aug 23, 2022
c69e760
Fixed formatting
reginald-mclean Aug 23, 2022
fe25aa9
Classic Envs Update (#774)
jjshoots Aug 24, 2022
7aacce2
simplification/refactor
WillDudley Aug 24, 2022
97b434c
fix bug in atari truncations
jjshoots Aug 25, 2022
1e126c2
fix rlcard no termination bug
jjshoots Aug 25, 2022
99469e9
fix bug in pistonball truncations
jjshoots Aug 25, 2022
17bf7a0
terminations truncations flipped
jjshoots Aug 25, 2022
16c5bca
all tests pass
jjshoots Aug 25, 2022
aef9a5a
RLCard refactor (#775)
jjshoots Sep 1, 2022
d148d8f
Merge branch 'master' into API_Update
jjshoots Sep 1, 2022
2644d06
Truncation update (#791)
WillDudley Sep 18, 2022
b8cb6c3
Api update conflicts (#792)
jjshoots Sep 18, 2022
a68e055
Api update conflicts (#793)
jjshoots Sep 18, 2022
936880b
Merge branch 'master' into API_Update
jjshoots Sep 18, 2022
136a6ee
attempt to fix pydocstyle (#794)
jjshoots Sep 18, 2022
5848b4e
black (#795)
jjshoots Sep 18, 2022
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
Prev Previous commit
Next Next commit
Reverting inequalities back
  • Loading branch information
@FilipinoGambino
FilipinoGambino committed Aug 17, 2022
commit 796f9b0adefaed82e9ed6bdf1727a851c9c6aa8e
6 changes: 3 additions & 3 deletions pettingzoo/butterfly/cooperative_pong/cooperative_pong.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ def get_valid_angle(randomizer):

angle = 0
while (
(angle > a1 and angle < b1)
or (angle > a2 and angle < b2)
or (angle > c1 and angle < d1)
(a1 < angle < b1)
or (a2 < angle < b2)
or (c1 < angle < d1)
or (angle > c2)
or (angle < d2)
):
Expand Down