Skip to content

Commit

Permalink
Merge all conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
goobta committed Mar 13, 2021
2 parents 38f3402 + 6be95ea commit 57abd87
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gym_solo/core/obs.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def get_obs(self) -> Tuple[solo_types.obs, List[str]]:
a = np.array(values)
low = obs.observation_space.low
hi = obs.observation_space.high
values = (2 * (a - low)) / (hi - low) - 1
values = ((2 * (a - low)) / (hi - low)) - 1

all_obs.append(values)

Expand Down Expand Up @@ -360,4 +360,4 @@ def compute(self) -> solo_types.obs:
if self._max_rot:
joint_values = np.clip(joint_values, -self._max_rot, self._max_rot)

return joint_values
return joint_values

0 comments on commit 57abd87

Please sign in to comment.