From 13c20b3506b48d344f63925ae6ed56d43eb5f5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20C=C3=A2mara?= Date: Tue, 8 Nov 2022 01:23:50 +0300 Subject: [PATCH] Remove deprecated randint, set Pyglet version, change env in main example --- lbforaging.py | 2 +- lbforaging/foraging/environment.py | 12 ++++++------ setup.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lbforaging.py b/lbforaging.py index 037e9d7..3286b60 100644 --- a/lbforaging.py +++ b/lbforaging.py @@ -37,7 +37,7 @@ def _game_loop(env, render): def main(game_count=1, render=False): - env = gym.make("Foraging-8x8-2p-2f-v2") + env = gym.make("Foraging-8x8-3p-2f-v2") obs = env.reset() for episode in range(game_count): diff --git a/lbforaging/foraging/environment.py b/lbforaging/foraging/environment.py index 0ef5980..f33e06d 100644 --- a/lbforaging/foraging/environment.py +++ b/lbforaging/foraging/environment.py @@ -253,8 +253,8 @@ def spawn_food(self, max_food, max_level): while food_count < max_food and attempts < 1000: attempts += 1 - row = self.np_random.randint(1, self.rows - 1) - col = self.np_random.randint(1, self.cols - 1) + row = self.np_random.integers(1, self.rows - 1) + col = self.np_random.integers(1, self.cols - 1) # check if it has neighbors: if ( @@ -267,7 +267,7 @@ def spawn_food(self, max_food, max_level): self.field[row, col] = ( min_level if min_level == max_level - else self.np_random.randint(min_level, max_level) + else self.np_random.integers(min_level, max_level) ) food_count += 1 self._food_spawned = self.field.sum() @@ -288,12 +288,12 @@ def spawn_players(self, max_player_level): player.reward = 0 while attempts < 1000: - row = self.np_random.randint(0, self.rows) - col = self.np_random.randint(0, self.cols) + row = self.np_random.integers(0, self.rows) + col = self.np_random.integers(0, self.cols) if self._is_empty_location(row, col): player.setup( (row, col), - self.np_random.randint(1, max_player_level), + self.np_random.integers(1, max_player_level), self.field_size, ) break diff --git a/setup.py b/setup.py index c91d310..7323765 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", ], - install_requires=["numpy", "gym>=0.12", "pyglet"], + install_requires=["numpy", "gym>=0.12", "pyglet<=1.5"], extras_require={"test": ["pytest"]}, include_package_data=True, )