1
0
mirror of https://github.com/gryf/coach.git synced 2025-12-18 03:30:19 +01:00

CARLA cleanups + calculating the distance to goal

This commit is contained in:
itaicaspi-intel
2018-09-16 16:37:04 +03:00
parent 6797824892
commit bb76c5c726
3 changed files with 8 additions and 7 deletions

View File

@@ -359,6 +359,9 @@ class CarlaEnvironment(Environment):
measurements.player_measurements.transform.location.y,
measurements.player_measurements.transform.location.z]
self.distance_from_goal = np.linalg.norm(np.array(self.location[:2]) -
[self.current_goal.location.x, self.current_goal.location.y])
is_collision = measurements.player_measurements.collision_vehicles != 0 \
or measurements.player_measurements.collision_pedestrians != 0 \
or measurements.player_measurements.collision_other != 0
@@ -381,8 +384,6 @@ class CarlaEnvironment(Environment):
self.state['high_level_command'] = directions
if (measurements.game_timestamp >= self.episode_max_time) or is_collision:
# screen.success('EPISODE IS DONE. GameTime: {}, Collision: {}'.format(str(measurements.game_timestamp),
# str(is_collision)))
self.done = True
self.state['measurements'] = np.array(self.measurements)