its training good
This commit is contained in:
@@ -8,7 +8,7 @@ from typing import Any, Callable, List, Optional, Sequence, Type, Union
|
||||
|
||||
class SB3EconConverter(VecEnv, gym.Env):
|
||||
|
||||
def __init__(self, env: gym.Env, econ: base_env.BaseEnvironment,agentclass: str):
|
||||
def __init__(self, env: gym.Env, econ: base_env.BaseEnvironment,agentclass: str,auto_reset: bool):
|
||||
self.env=env
|
||||
self.econ=econ
|
||||
#get observation sample
|
||||
@@ -20,7 +20,9 @@ class SB3EconConverter(VecEnv, gym.Env):
|
||||
#flatten obervation of first agent
|
||||
obs0=utils.package(obs[0],*self.packager)
|
||||
obs0["flat"]
|
||||
self.observation_space=gym.spaces.Box(low=-np.inf,high=np.inf,shape=(len(obs0["flat"]),),dtype=np.float32)
|
||||
self.step_request_send=False
|
||||
self.auto_reset=auto_reset
|
||||
self.observation_space=gym.spaces.Box(low=0,high=np.inf,shape=(len(obs0["flat"]),),dtype=np.float32)
|
||||
super().__init__(self.num_envs, self.observation_space, self.action_space)
|
||||
|
||||
|
||||
@@ -30,9 +32,11 @@ class SB3EconConverter(VecEnv, gym.Env):
|
||||
agent=self.econ.world.agents[idx]
|
||||
return gym.spaces.Discrete(agent.action_spaces)
|
||||
|
||||
def step_async(self, actions: np.ndarray) -> None:
|
||||
d_actions=utils.convert_gym_to_econ(actions)
|
||||
return self.env.step_async(d_actions)
|
||||
def step_async(self, actions: np.ndarray):
|
||||
if self.step_request_send==False:
|
||||
self.step_request_send=True
|
||||
d_actions=utils.convert_gym_to_econ(actions)
|
||||
return self.env.step_async(d_actions)
|
||||
|
||||
def step_wait(self) -> VecEnvStepReturn:
|
||||
obs,rew,done,info=self.env.step_wait()
|
||||
@@ -62,12 +66,14 @@ class SB3EconConverter(VecEnv, gym.Env):
|
||||
for i in range(self.num_envs):
|
||||
done_g[i]=done
|
||||
c_info[i]["terminal_observation"]=c_obs[i]
|
||||
c_obs=self.reset()
|
||||
|
||||
if self.auto_reset:
|
||||
c_obs=self.reset()
|
||||
self.step_request_send=False
|
||||
return np.copy(c_obs),np.copy(c_rew),np.copy(done_g),np.copy(c_info)
|
||||
|
||||
def reset(self) -> VecEnvObs:
|
||||
obs=self.env.reset()
|
||||
self.step_request_send=False
|
||||
f_obs={}
|
||||
self.curr_obs=obs
|
||||
for k,v in obs.items():
|
||||
|
||||
Reference in New Issue
Block a user