diff --git a/carla_environment.py b/carla_environment.py index 60683123c04c6fa8cdb59008a15db5a7f7e1a369..d53652009945ebc8a5968954e4f61774e772ff50 100644 --- a/carla_environment.py +++ b/carla_environment.py @@ -247,15 +247,23 @@ class World: carla.Rotation(pitch=0.000000, yaw=-175.922913, roll=-6.221135)) pos_diff = math.sqrt((target.location.x - x)**2 + (target.location.y - y)**2) - rot_diff = ((target.rotation.yaw / 180) - yaw) v = math.sqrt((vx)**2 + (vy)**2) r = -0.1 r += -0.01 * pos_diff - done = False + LEARN_FINAL_ORIENTATION = False + if LEARN_FINAL_ORIENTATION: + target_yaw = (-175.922913) / 180 + yaw_dif = math.sqrt((target_yaw**2) - (yaw**2)) + r += -0.01 * yaw_dif + + INSENTIVE_MOVING = False + if v < 0.01 and INSENTIVE_MOVING: + r -= 0.02 + done = False if pos_diff < 1.5: done = True r += 100 diff --git a/environment_wrapper.py b/environment_wrapper.py index c366b1e2bfffe9edb2984d14ae687770d4ac5382..61242e3ff4d0be5a80f080b8723b9d3b98c00fb3 100644 --- a/environment_wrapper.py +++ b/environment_wrapper.py @@ -22,6 +22,7 @@ class Config: learn_rate= 0.001 learn_iterations = 1 run_episodes = 20 + offline_batchsize = 2048 offline_epochs = 1000 offline_validate_every_x_iteration = 10 load_ann = False