Merge pull request #377 from PettingZoo-Team/multiwalker_bugfix

Fixed multiwalker crashing on completion issue
Farama-Foundation · May 14, 2021 · b232139 · b232139
2 parents 81125bb + 26dc463
commit b232139
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/docs/sisl/multiwalker.md b/docs/sisl/multiwalker.md
@@ -8,7 +8,7 @@ action-values: "(-1, 1)"
 observation-shape: "(31,)"
 observation-values: "[-inf,inf]"
 average-total-reward: "-300.86"
-import: "from pettingzoo.sisl import multiwalker_v6"
+import: "from pettingzoo.sisl import multiwalker_v7"
 agent-labels: "agents= ['walker_0', 'walker_1', 'walker_2']"
 ---
 

diff --git a/pettingzoo/sisl/__init__.py b/pettingzoo/sisl/__init__.py
@@ -1,11 +1,12 @@
 from pettingzoo.utils.deprecated_module import DeprecatedModule
 
-multiwalker_v0 = DeprecatedModule("multiwalker", "v0", "v6")
-multiwalker_v1 = DeprecatedModule("multiwalker", "v1", "v6")
-multiwalker_v2 = DeprecatedModule("multiwalker", "v2", "v6")
-multiwalker_v3 = DeprecatedModule("multiwalker", "v3", "v6")
-multiwalker_v4 = DeprecatedModule("multiwalker", "v4", "v6")
-multiwalker_v5 = DeprecatedModule("multiwalker", "v5", "v6")
+multiwalker_v0 = DeprecatedModule("multiwalker", "v0", "v7")
+multiwalker_v1 = DeprecatedModule("multiwalker", "v1", "v7")
+multiwalker_v2 = DeprecatedModule("multiwalker", "v2", "v7")
+multiwalker_v3 = DeprecatedModule("multiwalker", "v3", "v7")
+multiwalker_v4 = DeprecatedModule("multiwalker", "v4", "v7")
+multiwalker_v5 = DeprecatedModule("multiwalker", "v5", "v7")
+multiwalker_v6 = DeprecatedModule("multiwalker", "v6", "v7")
 pursuit_v0 = DeprecatedModule("pursuit", "v0", "v3")
 pursuit_v1 = DeprecatedModule("pursuit", "v1", "v3")
 pursuit_v2 = DeprecatedModule("pursuit", "v2", "v3")

diff --git a/pettingzoo/sisl/multiwalker/multiwalker.py b/pettingzoo/sisl/multiwalker/multiwalker.py
@@ -19,7 +19,7 @@ def env(**kwargs):
 
 class raw_env(AECEnv, EzPickle):
 
- metadata = {'render.modes': ['human', "rgb_array"], 'name': 'multiwalker_v6'}
+ metadata = {'render.modes': ['human', "rgb_array"], 'name': 'multiwalker_v7'}
 
  def __init__(self, *args, **kwargs):
  EzPickle.__init__(self, *args, **kwargs)

diff --git a/pettingzoo/sisl/multiwalker/multiwalker_base.py b/pettingzoo/sisl/multiwalker/multiwalker_base.py
@@ -447,7 +447,7 @@ def scroll_subroutine(self):
  rewards += self.terminate_reward
  done = [True] * self.n_walkers
  if pos[0] > (self.terrain_length - TERRAIN_GRASS) * TERRAIN_STEP:
- done = True
+ done = [True] * self.n_walkers
  rewards += self.fall_reward * self.fallen_walkers
  if self.terminate_on_fall and np.sum(self.fallen_walkers) > 0:
  rewards += self.terminate_reward

diff --git a/pettingzoo/sisl/multiwalker_v6.py → pettingzoo/sisl/multiwalker_v7.py b/pettingzoo/sisl/multiwalker_v6.py → pettingzoo/sisl/multiwalker_v7.py
diff --git a/pettingzoo/test/all_modules.py b/pettingzoo/test/all_modules.py
@@ -65,7 +65,7 @@
 
 from pettingzoo.sisl import pursuit_v3
 from pettingzoo.sisl import waterworld_v3
-from pettingzoo.sisl import multiwalker_v6
+from pettingzoo.sisl import multiwalker_v7
 
 all_prefixes = ["atari", "classic", "butterfly", "magent", "mpe", "sisl"]
 
@@ -144,7 +144,7 @@
  "mpe/simple_world_comm_v2": simple_world_comm_v2,
  "mpe/simple_v2": simple_v2,
 
- "sisl/multiwalker_v6": multiwalker_v6,
+ "sisl/multiwalker_v7": multiwalker_v7,
  "sisl/waterworld_v3": waterworld_v3,
  "sisl/pursuit_v3": pursuit_v3,
 }
diff --git a/pettingzoo/test/all_parameter_combs.py b/pettingzoo/test/all_parameter_combs.py
@@ -92,10 +92,10 @@
  (simple_world_comm_v2.env, dict(num_good=5, num_adversaries=10, num_obstacles=4, num_food=3)),
  (simple_world_comm_v2.env, dict(num_good=1, num_adversaries=1, num_obstacles=1, num_food=1)),
 
- (multiwalker_v6.env, dict(n_walkers=10)),
- (multiwalker_v6.env, dict(local_ratio=0.5)),
- (multiwalker_v6.env, dict(terminate_on_fall=False)),
- (multiwalker_v6.env, dict(terminate_on_fall=False, remove_on_fall=False)),
+ (multiwalker_v7.env, dict(n_walkers=10)),
+ (multiwalker_v7.env, dict(local_ratio=0.5)),
+ (multiwalker_v7.env, dict(terminate_on_fall=False)),
+ (multiwalker_v7.env, dict(terminate_on_fall=False, remove_on_fall=False)),
 
  (pursuit_v3.env, dict(x_size=8, y_size=19)),
  (pursuit_v3.env, dict(local_ratio=0.5)),