Made path_decay configurable

columbus/entities.py

@@ -19,7 +19,7 @@ class Entity(object):
         self.col = (255, 255, 255)
         self.solid = False
         self.movable = False  # False = Non movable, True = Movable, x>1: lighter movable
-        self.void_collidable = True
+        self.void_collidable = False
         self.elasticity = 1
         self.collision_changes_speed = self.env.controll_type == 'ACC'
         self.collision_elasticity = self.env.default_collision_elasticity
@@ -49,7 +49,7 @@ class Entity(object):
         if speeds > self.max_speed:
             vx, vy = vx/speeds*self.max_speed, vy/speeds*self.max_speed
         x, y = x+vx*self.env.speed_fac, y+vy*self.env.speed_fac
-        if not self.env.torus_topology:
+        if not self.env.torus_topology and self.void_collidable:
             if x > 1 or x < 0:
                 x, y, vx, vy = self.calc_void_collision(x < 0, x, y, vx, vy)
             if y > 1 or y < 0:
@@ -341,6 +341,7 @@ class Agent(CircularEntity):
         self.controll_type = self.env.controll_type
         self.solid = True
         self.movable = True
+        self.void_collidable = True
 
     def controll_step(self):
         self._read_input()

columbus/env.py

@@ -13,9 +13,10 @@ from columbus.utils import soft_int, parseObs
 
 
 class ColumbusEnv(gym.Env):
-    metadata = {'render.modes': ['human']}
+    metadata = {'render.modes': ['human'], 'render_modes': [
+        'human', 'non-human'], 'render_fps': 60}
 
-    def __init__(self, observable=observables.Observable(), fps=60, env_seed=3.1, master_seed=None, start_pos=(0.5, 0.5), start_score=0, speed_fac=0.01, acc_fac=0.04, die_on_zero=False, return_on_score=-1, reward_mult=1, agent_drag=0, controll_type='SPEED', aux_reward_max=1, aux_penalty_max=0, aux_reward_discretize=0, void_is_type_barrier=True, void_damage=1, torus_topology=False, default_collision_elasticity=1, terminate_on_reward=False, agent_draw_path=False, clear_path_on_reset=True, max_steps=-1, value_color_mapper='tanh', width=720, height=720, agent_attrs={}, agent_cls=entities.Agent, exception_for_unsupported_collision=True):
+    def __init__(self, observable=observables.Observable(), fps=60, env_seed=3.1, master_seed=None, start_pos=(0.5, 0.5), start_score=0, speed_fac=0.01, acc_fac=0.04, die_on_zero=False, return_on_score=-1, reward_mult=1, agent_drag=0, controll_type='SPEED', aux_reward_max=1, aux_penalty_max=0, aux_reward_discretize=0, void_is_type_barrier=True, void_damage=1, torus_topology=False, default_collision_elasticity=1, terminate_on_reward=False, agent_draw_path=False, clear_path_on_reset=True, max_steps=-1, value_color_mapper='tanh', width=720, height=720, agent_attrs={}, agent_cls=entities.Agent, exception_for_unsupported_collision=True, path_decay=0.1):
         super(ColumbusEnv, self).__init__()
         self.action_space = spaces.Box(
             low=-1, high=1, shape=(2,), dtype=np.float32)
@@ -61,7 +62,7 @@ class ColumbusEnv(gym.Env):
         self.terminate_on_reward = terminate_on_reward
         self.agent_draw_path = agent_draw_path
         self.clear_path_on_reset = clear_path_on_reset
-        self.path_decay = 0.1
+        self.path_decay = path_decay
 
         if isinstance(agent_cls, str):
             agent_cls = getattr(entities, agent_cls)
@@ -94,6 +95,8 @@ class ColumbusEnv(gym.Env):
 
         self._init = False
 
+        self.is_columbus_env = True
+
     @property
     def observation_space(self):
         if not self._init:
@@ -563,6 +566,8 @@ class ColumbusConfigDefined(ColumbusEnv):
                     else:
                         v = v_raw
                     if k.endswith('_rand'):
+                        v = self.conv_unit(
+                            v_raw, target='px', axis='y' if k == 'height_rand' else 'x')
                         if isinstance(v, int):
                             n = k.replace('_rand', '')
                             cur = getattr(
@@ -570,7 +575,7 @@ class ColumbusConfigDefined(ColumbusEnv):
                             inc = int((v+0.99)*self.random())
                             setattr(entity, n, cur + inc)
                         elif isinstance(v, float):
-                            n = k.replace('_randf', '')
+                            n = k.replace('_rand', '')
                             cur = getattr(
                                 entity, n)
                             inc = v*self.random()
@@ -584,7 +589,7 @@ class ColumbusConfigDefined(ColumbusEnv):
                                     cur[vi] = int((v+0.99)*self.random())
                                     setattr(entity, n, cur)
                                 elif isinstance(v, float):
-                                    n = k.replace('_randf', '')
+                                    n = k.replace('_rand', '')
                                     cur = getattr(
                                         entity, n)
                                     cur[vi] = v*self.random()