Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions rtgym/envs/real_time_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,8 @@ def __update_obs_rew_terminated_truncated(self):
elt = o
if self.obs_prepro_func:
elt = self.obs_prepro_func(elt)
elt = tuple(elt)
if not isinstance(elt, dict):
elt = tuple(elt)
self.__obs, self.__rew, self.__terminated, self.__info = elt, r, d, i
self.__o_set_flag.set()
self.__o_lock.release()
Expand Down Expand Up @@ -830,10 +831,14 @@ def reset(self, seed=None, options=None):
self.__ev_end_reset.clear()
elt, info = self.__reset_result
if self.act_in_obs:
elt = elt + list(self.act_buf)
if not isinstance(elt, dict):
elt = elt + list(self.act_buf)
else:
elt["actions"] = self.act_buf
if self.obs_prepro_func:
elt = self.obs_prepro_func(elt)
elt = tuple(elt)
if not isinstance(elt, dict):
elt = tuple(elt)
if not self.time_initialized:
self._initialize_time()
self._wait_thread() # Need to wait here as self.__ts_running is set
Expand Down Expand Up @@ -877,8 +882,16 @@ def step(self, action):
self.running = False
if self.wait_on_done:
self.wait()
if self.act_in_obs:
obs = tuple((*obs, *tuple(self.act_buf),))
if self.act_in_obs:
if not isinstance(obs, dict):
obs = tuple(
(
*obs,
*tuple(self.act_buf),
)
)
else:
obs["actions"] = tuple(self.act_buf)
if self.benchmark:
self.bench.end_step_time()
return obs, rew, terminated, truncated, info
Expand Down