Merge branch 'master' of github.com:PettingZoo-Team/PettingZoo

Farama-Foundation · Oct 8, 2021 · 3a36b77 · 3a36b77
2 parents 290dd03 + 5c655c6
commit 3a36b77
Show file tree

Hide file tree

Showing 81 changed files with 295 additions and 43 deletions.
diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml
@@ -29,6 +29,7 @@ jobs:
       run: |
         pytest ./test/pytest_runner.py
         pytest ./test/all_parameter_combs.py
+        pytest ./test/variable_env_test.py
     - name: Bandit, Codespell, and Flake 8 tests
       run: |
         bash ./check_style.sh

diff --git a/docs/_data/style.yml b/docs/_data/style.yml
@@ -1,5 +1,5 @@
 #Color Customization
-highlight: "#86193F"
+highlight: "#79e6c0"
 #white: "#FF0000"
 black: "#ed1c2e"
 

diff --git a/docs/_includes/info_box.md b/docs/_includes/info_box.md
@@ -11,6 +11,39 @@
 
 This environment is part of the [{{category_name}} environments](../{{category_name}}). Please read that page first for general information.
 
+
+{% if page.state-shape and page.average-total-reward %}
+Name | Value
+--- | ---
+Actions | {{ page.actions }}
+Agents | {{ page.agents }}
+Parallel API | {% if page.is_parallel %} Yes {% else %} No {% endif %}
+Manual Control | {{ page.manual-control }}
+Action Shape | {{ page.action-shape }}
+Action Values | {{ page.action-values }}
+Observation Shape | {{ page.observation-shape }}
+Observation Values | {{ page.observation-values }}
+Import | `{{ page.import }}`
+Agents | `{{ page.agent-labels }}`
+State Shape | {{ page.state-shape }}
+State Values | {{ page.state-values }}
+Average Total Reward | {{ page.average-total-reward }}
+{% elsif page.state-shape %}
+Name | Value
+--- | ---
+Actions | {{ page.actions }}
+Agents | {{ page.agents }}
+Parallel API | {% if page.is_parallel %} Yes {% else %} No {% endif %}
+Manual Control | {{ page.manual-control }}
+Action Shape | {{ page.action-shape }}
+Action Values | {{ page.action-values }}
+Observation Shape | {{ page.observation-shape }}
+Observation Values | {{ page.observation-values }}
+Import | `{{ page.import }}`
+Agents | `{{ page.agent-labels }}`
+State Shape | {{ page.state-shape }}
+State Values | {{ page.state-values }}
+{% elsif page.average-total-reward %}
 Name | Value
 --- | ---
 Actions | {{ page.actions }}
@@ -23,9 +56,22 @@ Observation Shape | {{ page.observation-shape }}
 Observation Values | {{ page.observation-values }}
 Import | `{{ page.import }}`
 Agents | `{{ page.agent-labels }}`
-{% if page.state-shape %}State Shape | {{ page.state-shape }}{% endif %}
-{% if page.state-values %}State Values | {{ page.state-values }}{% endif %}
-{% if page.average-total-reward %}Average Total Reward | {{ page.average-total-reward }}{% endif %}
+Average Total Reward | {{ page.average-total-reward }}
+{% else %}
+Name | Value
+--- | ---
+Actions | {{ page.actions }}
+Agents | {{ page.agents }}
+Parallel API | {% if page.is_parallel %} Yes {% else %} No {% endif %}
+Manual Control | {{ page.manual-control }}
+Action Shape | {{ page.action-shape }}
+Action Values | {{ page.action-values }}
+Observation Shape | {{ page.observation-shape }}
+Observation Values | {{ page.observation-values }}
+Import | `{{ page.import }}`
+Agents | `{{ page.agent-labels }}`
+{% endif %}
+
 
 #### Agent Environment Cycle
 

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -4,7 +4,7 @@
   <link rel="stylesheet" href="/assets/css/website.css">
   {% include head.html %}
 
-  <body id="page-top">
+  <body class="zoom" id="page-top">
 
       {{ content }}
 

diff --git a/docs/assets/css/bootstrap.min.css b/docs/assets/css/bootstrap.min.css
diff --git a/docs/assets/css/highlighting.css b/docs/assets/css/highlighting.css
@@ -1,7 +1,7 @@
 .highlight .hll { background-color: #ffffcc }
 .highlight .c { color: #999988; font-style: italic } /* Comment */
 .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { color: #000000; font-weight: bold } /* Keyword */
+.highlight .k { color: #a041b8; font-weight: bold } /* Keyword */
 .highlight .o { color: #000000; font-weight: bold } /* Operator */
 .highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
 .highlight .cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */
@@ -19,7 +19,7 @@
 .highlight .gt { color: #aa0000 } /* Generic.Traceback */
 .highlight .kc { color: #000000; font-weight: bold } /* Keyword.Constant */
 .highlight .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #000000; font-weight: bold } /* Keyword.Namespace */
+.highlight .kn { color: #a041b8; font-weight: bold } /* Keyword.Namespace */
 .highlight .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
 .highlight .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
 .highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
@@ -32,12 +32,12 @@
 .highlight .nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */
 .highlight .ni { color: #800080 } /* Name.Entity */
 .highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nf { color: #303bc9; font-weight: bold } /* Name.Function */
 .highlight .nl { color: #990000; font-weight: bold } /* Name.Label */
-.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nn { color: #c92672 } /* Name.Namespace */
 .highlight .nt { color: #000080 } /* Name.Tag */
 .highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { color: #000000; font-weight: bold } /* Operator.Word */
+.highlight .ow { color: #a041b8; font-weight: bold } /* Operator.Word */
 .highlight .w { color: #bbbbbb } /* Text.Whitespace */
 .highlight .mf { color: #009999 } /* Literal.Number.Float */
 .highlight .mh { color: #009999 } /* Literal.Number.Hex */
@@ -54,7 +54,7 @@
 .highlight .sr { color: #009926 } /* Literal.String.Regex */
 .highlight .s1 { color: #d01040 } /* Literal.String.Single */
 .highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .bp { color: #2b41bb } /* Name.Builtin.Pseudo */
 .highlight .vc { color: #008080 } /* Name.Variable.Class */
 .highlight .vg { color: #008080 } /* Name.Variable.Global */
 .highlight .vi { color: #008080 } /* Name.Variable.Instance */

diff --git a/docs/assets/css/website.css b/docs/assets/css/website.css
@@ -1,6 +1,7 @@
 .code {
     color: #86193F;
 }
+
 .bottom-padding {
     padding-bottom: 50px;
 }
@@ -330,7 +331,7 @@
     right: 0;
     bottom: 0;
     top: 0;
-    width: 24%;
+    width: 19%;
     z-index: 1030
 }
 
@@ -482,6 +483,33 @@
     .timeline-container {
         margin-left: 189px;
     }
+    .docu-content {
+        height: 100vh;
+    }
+    .docu-info {
+        height: 100vh;
+    }
+    .selection-content {
+        height: 100vh;
+    }
+    .selection-table-container {
+        height: 100vh;
+    }
+}
+
+@media screen and (max-width: 1440px) and (min-width: 992px) {
+    .docu-content {
+        height: 125vh;
+    }
+    .docu-info {
+        height: 125vh;
+    }
+    .selection-content {
+        height: 125vh;
+    }
+    .selection-table-container {
+        height: 125vh;
+    }
 }
 
 @media screen and (max-height: 600px) and (min-width: 992px) {
@@ -504,6 +532,9 @@
     .copyright {
         visibility: hidden;
     }
+    .zoom {
+        zoom: .8;
+    }
 }
 
 @media (max-width: 992px) {
@@ -558,7 +589,6 @@
 
     .selection-table-container {
         width: 50%;
-        height: 100vh;
         overflow-y: auto;
         padding: 10px;
         overflow-x: auto;
@@ -569,7 +599,6 @@
         width: 50%;
         float: left;
         box-sizing: border-box;
-        height: 100vh;
         overflow-y: auto;
         padding: 10px;
         padding-top: 80px;
@@ -578,9 +607,9 @@
 
     .docu-info {
         width: 30%;
-        height: 100vh;
         overflow-y: auto;
         padding: 10px;
+        padding-top: 40px;
         overflow-x: auto;
         float: left;
     }
@@ -589,7 +618,6 @@
         width:70%;
         float: left;
         box-sizing: border-box;
-        height: 100vh;
         overflow-y: auto;
         padding: 10px;
         padding-left: 5vw;

diff --git a/docs/assets/img/icons/Atari/BasketBallPong.png b/docs/assets/img/icons/Atari/BasketBallPong.png
diff --git a/docs/assets/img/icons/Atari/Boxing.png b/docs/assets/img/icons/Atari/Boxing.png
diff --git a/docs/assets/img/icons/Atari/CombatPlane.png b/docs/assets/img/icons/Atari/CombatPlane.png
diff --git a/docs/assets/img/icons/Atari/CombatTank.png b/docs/assets/img/icons/Atari/CombatTank.png
diff --git a/docs/assets/img/icons/Atari/DoubleDunk.png b/docs/assets/img/icons/Atari/DoubleDunk.png
diff --git a/docs/assets/img/icons/Atari/EntombedCompetitive.png b/docs/assets/img/icons/Atari/EntombedCompetitive.png
diff --git a/docs/assets/img/icons/Atari/EntombedCooperative.png b/docs/assets/img/icons/Atari/EntombedCooperative.png
diff --git a/docs/assets/img/icons/Atari/FlagCapture.png b/docs/assets/img/icons/Atari/FlagCapture.png
diff --git a/docs/assets/img/icons/Atari/Foozpong.png b/docs/assets/img/icons/Atari/Foozpong.png
diff --git a/docs/assets/img/icons/Atari/IceHockey.png b/docs/assets/img/icons/Atari/IceHockey.png
diff --git a/docs/assets/img/icons/Atari/Joust.png b/docs/assets/img/icons/Atari/Joust.png
diff --git a/docs/assets/img/icons/Atari/MarioBros.png b/docs/assets/img/icons/Atari/MarioBros.png
diff --git a/docs/assets/img/icons/Atari/MazeCraze.png b/docs/assets/img/icons/Atari/MazeCraze.png
diff --git a/docs/assets/img/icons/Atari/Othello.png b/docs/assets/img/icons/Atari/Othello.png
diff --git a/docs/assets/img/icons/Atari/Pong.png b/docs/assets/img/icons/Atari/Pong.png
diff --git a/docs/assets/img/icons/Atari/Quadrapong.png b/docs/assets/img/icons/Atari/Quadrapong.png
diff --git a/docs/assets/img/icons/Atari/SpaceInvaders.png b/docs/assets/img/icons/Atari/SpaceInvaders.png
diff --git a/docs/assets/img/icons/Atari/Spacewar.png b/docs/assets/img/icons/Atari/Spacewar.png
diff --git a/docs/assets/img/icons/Atari/Surround.png b/docs/assets/img/icons/Atari/Surround.png
diff --git a/docs/assets/img/icons/Atari/Tennis.png b/docs/assets/img/icons/Atari/Tennis.png
diff --git a/docs/assets/img/icons/Atari/VideoCheckers.png b/docs/assets/img/icons/Atari/VideoCheckers.png
diff --git a/docs/assets/img/icons/Atari/VolleyballPong.png b/docs/assets/img/icons/Atari/VolleyballPong.png
diff --git a/docs/assets/img/icons/Atari/Warlords.png b/docs/assets/img/icons/Atari/Warlords.png
diff --git a/docs/assets/img/icons/Atari/WizardOfWor.png b/docs/assets/img/icons/Atari/WizardOfWor.png
diff --git a/docs/assets/img/icons/Butterfly/CooperativePong.png b/docs/assets/img/icons/Butterfly/CooperativePong.png
diff --git a/docs/assets/img/icons/Butterfly/KnightsArchersZombies('KAZ').png b/docs/assets/img/icons/Butterfly/KnightsArchersZombies('KAZ').png
diff --git a/docs/assets/img/icons/Butterfly/PistonBall.png b/docs/assets/img/icons/Butterfly/PistonBall.png
diff --git a/docs/assets/img/icons/Butterfly/Prison.png b/docs/assets/img/icons/Butterfly/Prison.png
diff --git a/docs/assets/img/icons/Butterfly/Prospector.png b/docs/assets/img/icons/Butterfly/Prospector.png
diff --git a/docs/assets/img/icons/Classic/Backgammon.png b/docs/assets/img/icons/Classic/Backgammon.png
diff --git a/docs/assets/img/icons/Classic/Checkers.png b/docs/assets/img/icons/Classic/Checkers.png
diff --git a/docs/assets/img/icons/Classic/Chess.png b/docs/assets/img/icons/Classic/Chess.png
diff --git a/docs/assets/img/icons/Classic/ConnectFour.png b/docs/assets/img/icons/Classic/ConnectFour.png
diff --git a/docs/assets/img/icons/Classic/DouDizhu.png b/docs/assets/img/icons/Classic/DouDizhu.png
diff --git a/docs/assets/img/icons/Classic/GinRummy.png b/docs/assets/img/icons/Classic/GinRummy.png
diff --git a/docs/assets/img/icons/Classic/Go.png b/docs/assets/img/icons/Classic/Go.png
diff --git a/docs/assets/img/icons/Classic/Hanabi.png b/docs/assets/img/icons/Classic/Hanabi.png
diff --git a/docs/assets/img/icons/Classic/LeducHold'em.png b/docs/assets/img/icons/Classic/LeducHold'em.png
diff --git a/docs/assets/img/icons/Classic/Mahjong.png b/docs/assets/img/icons/Classic/Mahjong.png
diff --git a/docs/assets/img/icons/Classic/RockPaperScissors.png b/docs/assets/img/icons/Classic/RockPaperScissors.png
diff --git a/docs/assets/img/icons/Classic/TexasHold'em.png b/docs/assets/img/icons/Classic/TexasHold'em.png
diff --git a/docs/assets/img/icons/Classic/TexasHold'emNoLimit.png b/docs/assets/img/icons/Classic/TexasHold'emNoLimit.png
diff --git a/docs/assets/img/icons/Classic/TicTacToe.png b/docs/assets/img/icons/Classic/TicTacToe.png
diff --git a/docs/assets/img/icons/Classic/Uno.png b/docs/assets/img/icons/Classic/Uno.png
diff --git a/docs/assets/img/icons/MAgent/Adversarial Pursuit.png b/docs/assets/img/icons/MAgent/Adversarial Pursuit.png
diff --git a/docs/assets/img/icons/MAgent/AdversarialPursuit.png b/docs/assets/img/icons/MAgent/AdversarialPursuit.png
diff --git a/docs/assets/img/icons/MAgent/Battle.png b/docs/assets/img/icons/MAgent/Battle.png
diff --git a/docs/assets/img/icons/MAgent/Battlefield.png b/docs/assets/img/icons/MAgent/Battlefield.png
diff --git a/docs/assets/img/icons/MAgent/CombinedArms.png b/docs/assets/img/icons/MAgent/CombinedArms.png
diff --git a/docs/assets/img/icons/MAgent/Gather.png b/docs/assets/img/icons/MAgent/Gather.png
diff --git a/docs/assets/img/icons/MAgent/Tiger-Deer.png b/docs/assets/img/icons/MAgent/Tiger-Deer.png
diff --git a/docs/assets/img/icons/MPE/Simple.png b/docs/assets/img/icons/MPE/Simple.png
diff --git a/docs/assets/img/icons/MPE/SimpleAdversary.png b/docs/assets/img/icons/MPE/SimpleAdversary.png
diff --git a/docs/assets/img/icons/MPE/SimpleCrypto.png b/docs/assets/img/icons/MPE/SimpleCrypto.png
diff --git a/docs/assets/img/icons/MPE/SimplePush.png b/docs/assets/img/icons/MPE/SimplePush.png
diff --git a/docs/assets/img/icons/MPE/SimpleReference.png b/docs/assets/img/icons/MPE/SimpleReference.png
diff --git a/docs/assets/img/icons/MPE/SimpleSpeakerListener.png b/docs/assets/img/icons/MPE/SimpleSpeakerListener.png
diff --git a/docs/assets/img/icons/MPE/SimpleSpread.png b/docs/assets/img/icons/MPE/SimpleSpread.png
diff --git a/docs/assets/img/icons/MPE/SimpleTag.png b/docs/assets/img/icons/MPE/SimpleTag.png
diff --git a/docs/assets/img/icons/MPE/SimpleWorldComm.png b/docs/assets/img/icons/MPE/SimpleWorldComm.png
diff --git a/docs/assets/img/icons/SISL/MultiWalker.png b/docs/assets/img/icons/SISL/MultiWalker.png
diff --git a/docs/assets/img/icons/SISL/Pursuit.png b/docs/assets/img/icons/SISL/Pursuit.png
diff --git a/docs/assets/img/icons/SISL/WaterWorld.png b/docs/assets/img/icons/SISL/WaterWorld.png
diff --git a/docs/magent.md b/docs/magent.md
@@ -42,12 +42,7 @@ The MAgent environments were originally created for the following work:
 
 ```
 @article{DBLP:journals/corr/abs-1712-00600,
-  author    = {Lianmin Zheng and
-               Jiacheng Yang and
-               Han Cai and
-               Weinan Zhang and
-               Jun Wang and
-               Yong Yu},
+  author    = {Lianmin Zheng and Jiacheng Yang and Han Cai and Weinan Zhang and Jun Wang and Yong Yu},
   title     = {MAgent: {A} Many-Agent Reinforcement Learning Platform for Artificial
                Collective Intelligence},
   journal   = {CoRR},
@@ -56,9 +51,6 @@ The MAgent environments were originally created for the following work:
   url       = {http://arxiv.org/abs/1712.00600},
   archivePrefix = {arXiv},
   eprint    = {1712.00600},
-  timestamp = {Sun, 21 Apr 2019 10:04:41 +0200},
-  biburl    = {https://dblp.org/rec/journals/corr/abs-1712-00600.bib},
-  bibsource = {dblp computer science bibliography, https://dblp.org}
 }
 ```