Skip to content

Commit

Permalink
fixed bug in the reward wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
FilipinoGambino committed Feb 2, 2024
1 parent 4c52e03 commit 546750c
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 806 deletions.
52 changes: 0 additions & 52 deletions config.yaml

This file was deleted.

1 change: 1 addition & 0 deletions connectx/connectx_gym/connectx_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from ..utility_constants import BOARD_SIZE


class ConnectFour(gym.Env):
metadata = {'render_modes': ['human']}
spec = None
Expand Down
19 changes: 5 additions & 14 deletions connectx/connectx_gym/wrappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ def info(self, info: Dict[str, np.ndarray], rewards: int) -> Dict[str, np.ndarra
logs = dict(step=self.env.unwrapped.turn)

self.reward_sum.append(rewards)
logs["reward_length"] = [len(self.reward_sum)]
logs["mean_cumulative_rewards"] = [np.mean(self.reward_sum)]
logs["mean_cumulative_reward_magnitudes"] = [np.mean(np.abs(self.reward_sum))]
logs["max_cumulative_rewards"] = [np.max(self.reward_sum)]
logs["rewards"] = self.reward_sum


info.update({f"LOGGING_{key}": np.array(val, dtype=np.float32) for key, val in logs.items()})
Expand All @@ -47,23 +45,16 @@ def __init__(self, env: gym.Env, reward_space: BaseRewardSpace):
self.reward_space = reward_space

def _get_rewards_and_done(self) -> Tuple[Tuple[float, float], bool]:
# for key,val in self.unwrapped.env.dict().items():
# print(key, val)
rewards, done = self.reward_space.compute_rewards(self.unwrapped.env)
if self.unwrapped.env.done and not done:
raise RuntimeError("Reward space did not return done, but the connectx engine is done.")
rewards, done = self.reward_space.compute_rewards(self.unwrapped)
return rewards, done

def reset(self, **kwargs):
obs, reward, done, info = super(RewardSpaceWrapper, self).reset(**kwargs)
# return obs, *self._get_rewards_and_done(), info
return obs, reward, done, info
obs, _, _, info = super(RewardSpaceWrapper, self).reset(**kwargs)
return obs, *self._get_rewards_and_done(), info

def step(self, action):
# obs, _, _, info = super(RewardSpaceWrapper, self).step(action)
# return obs, *self._get_rewards_and_done(), info
obs, reward, done, info = super(RewardSpaceWrapper, self).step(action)
return obs, reward, done, info
obs, _, _, info = super(RewardSpaceWrapper, self).step(action)
return obs, *self._get_rewards_and_done(), info

class VecEnv(gym.Env):
def __init__(self, envs: List[gym.Env]):
Expand Down
41 changes: 0 additions & 41 deletions outputs/02-01/16-34-37/.hydra/config.yaml

This file was deleted.

154 changes: 0 additions & 154 deletions outputs/02-01/16-34-37/.hydra/hydra.yaml

This file was deleted.

1 change: 0 additions & 1 deletion outputs/02-01/16-34-37/.hydra/overrides.yaml

This file was deleted.

41 changes: 0 additions & 41 deletions outputs/02-02/09-55-53/.hydra/config.yaml

This file was deleted.

Loading

0 comments on commit 546750c

Please sign in to comment.