dodox/Columbus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto reset after init

Browse Source
This commit is contained in:
Dominik Moritz Roth 2022-08-27 16:20:39 +02:00
parent 6427342a67
commit 6425a4f829
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
columbus/env.py
View File

@ -95,8 +95,12 @@ class ColumbusEnv(gym.Env):
self.rng = random_dont_use.Random() self.rng = random_dont_use.Random()
self._seed(self.env_seed) self._seed(self.env_seed)
self._init = False
@property @property
def observation_space(self): def observation_space(self):
if not self._init:
self.reset()
return self.observable.get_observation_space() return self.observable.get_observation_space()
def _seed(self, seed): def _seed(self, seed):
@ -170,7 +174,8 @@ class ColumbusEnv(gym.Env):
return aux_reward/self.fps return aux_reward/self.fps
def step(self, action): def step(self, action):
# TODO: Just make the range consistent... if not self._init:
self.reset()
inp = (action[0]+1)/2, (action[1]+1)/2 inp = (action[0]+1)/2, (action[1]+1)/2
if self._disturb_next: if self._disturb_next:
inp = self._disturb_next inp = self._disturb_next
@ -235,6 +240,7 @@ class ColumbusEnv(gym.Env):
def reset(self): def reset(self):
pygame.init() pygame.init()
self._init = True
self._seed(self.env_seed) self._seed(self.env_seed)
self._rendered = False self._rendered = False
self._disturb_next = False self._disturb_next = False
@ -654,7 +660,7 @@ class ColumbusConfigDefined(ColumbusEnv):
class ColumbusBlub(ColumbusEnv): class ColumbusBlub(ColumbusEnv):
def __init__(self, observable=observables.Observable(), env_seed=None, entities=[], fps=30, **kw): def __init__(self, observable=observables.Observable(), env_seed=None, entities=[], fps=30, **kw):
super().__init__( super().__init__(
observable=observable, fps=fps, env_seed=env_seed, default_collision_elasticity=0.9, speed_fac=0.01, acc_fac=0.1, agent_drag=0.05, controll_type='ACC') observable=observable, fps=fps, env_seed=env_seed, default_collision_elasticity=0.8, speed_fac=0.01, acc_fac=0.1, agent_drag=0.06, controll_type='ACC')
def setup(self): def setup(self):
self.agent.pos = self.start_pos self.agent.pos = self.start_pos
@ -664,7 +670,7 @@ class ColumbusBlub(ColumbusEnv):
self.entities.append(enemy) self.entities.append(enemy)
for i in range(1): for i in range(1):
reward = entities.TeleportingReward(self) reward = entities.TeleportingReward(self)
reward.radius = 100 reward.radius = 20
self.entities.append(reward) self.entities.append(reward)