Skip to content

Commit 8d57ec9

Browse files
committed
Remove some redundant code.
1 parent d64a47b commit 8d57ec9

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

smarts/core/smarts.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,9 +1513,7 @@ def _check_ground_plane(self):
15131513
)
15141514
self._setup_pybullet_ground_plane(self._bullet_client)
15151515

1516-
def _try_emit_envision_state(self, provider_state: ProviderState, obs, scores):
1517-
if not self._envision:
1518-
return
1516+
def _gen_envision_state(self, provider_state: ProviderState, obs, scores):
15191517

15201518
filter = self._envision.envision_state_filter
15211519

@@ -1671,6 +1669,12 @@ def _try_emit_envision_state(self, provider_state: ProviderState, obs, scores):
16711669
ego_agent_ids=list(self._agent_manager.ego_agent_ids),
16721670
frame_time=self._rounder(self._elapsed_sim_time + self._total_sim_time),
16731671
)
1672+
return state
1673+
1674+
def _try_emit_envision_state(self, provider_state: ProviderState, obs, scores):
1675+
if not self._envision:
1676+
return
1677+
state = self._gen_envision_state(provider_state, obs, scores)
16741678
self._envision.send(state)
16751679

16761680
def _try_emit_visdom_obs(self, obs):

smarts/env/gymnasium/hiway_env_v1.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ class HiWayEnvV1(gym.Env):
139139
action_space: spaces.Space
140140
observation_space: spaces.Space
141141

142-
# Created
143-
_np_random: Optional[np.random.Generator] = None
144-
145142
def __init__(
146143
self,
147144
scenarios: Sequence[str],
@@ -403,27 +400,16 @@ def close(self):
403400
if self._smarts is not None:
404401
self._smarts.destroy()
405402

406-
@property
407-
def unwrapped(self) -> gym.Env[ObsType, ActType]:
408-
"""Returns the base non-wrapped environment.
409-
410-
Returns:
411-
Env: The base non-wrapped :class:`gymnasium.Env` instance
412-
"""
413-
return self
414-
415403
@property
416404
def np_random(self) -> np.random.Generator:
417-
"""Returns the environment's internal :attr:`_np_random` that if not set will initialise with a random seed.
418-
419-
Returns:
420-
Instances of `np.random.Generator`.
421-
"""
422405
return super().np_random
423406

424407
@np_random.setter
425408
def np_random(self, value: np.random.Generator):
426-
self._np_random = value
409+
warnings.warn(
410+
"The generator in `np_random` is not used. This method will have no effect on the environment."
411+
)
412+
super()._np_random = value
427413

428414
def __str__(self):
429415
"""Returns a string of the environment with :attr:`spec` id's if :attr:`spec`.

0 commit comments

Comments
 (0)