diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py index 13bdf2eb7a..230a4e6cf1 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py @@ -182,7 +182,7 @@ def reset(self): self.transform = Transform( Location(x=self.initial_pos[0], y=self.initial_pos[1], z=self.initial_pos[2]), - Rotation(yaw=-correct_yaw) # 使用路径的朝向 + Rotation(yaw=correct_yaw) # 使用路径的朝向 ) # 生成车辆 @@ -195,7 +195,7 @@ def reset(self): offset_y = random.uniform(-2.0, 2.0) temp_transform = Transform( Location(x=self.initial_pos[0] + offset_x, y=self.initial_pos[1] + offset_y, z=self.initial_pos[2]), - Rotation(yaw=-correct_yaw) + Rotation(yaw=correct_yaw) ) self.vehicle = self.world.try_spawn_actor(self.model_3, temp_transform) if self.vehicle is not None: diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py index c2bae517cb..cd89a466af 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py @@ -5,19 +5,19 @@ # ==================== 轨迹配置 ==================== TRAJECTORIES = { "custom_trajectory": { - "start": [-8.77956485748291, 140.2951202392578, 2.0014660358428955, 0], - "end": [74.17852020263672, -56.52183151245117, 0.18172569572925568], + "start": [108.91605377197266,101.3561782836914,0.6136533617973328, 0], + "end": [74.64781951904297,-56.014076232910156,0.40768954157829285], "description": "自定义轨迹 - 城镇道路" }, "test_trajectory": { - "start": [0.0, 0.0, 2.0, 0], - "end": [100.0, 0.0, 2.0], + "start": [98.25761413574219,99.15800476074219,0.4944169223308563, 0], + "end": [74.64781951904297,-56.014076232910156,0.40768954157829285], "description": "测试轨迹 - 直线道路" } } # 当前使用的轨迹 -CURRENT_TRAJECTORY = "custom_trajectory" +CURRENT_TRAJECTORY = "test_trajectory" def get_current_trajectory(): """获取当前轨迹配置""" @@ -49,7 +49,7 @@ def get_current_trajectory(): EPISODE_INTERVAL = 2.0 # episode之间的间隔秒数 # ==================== 交通配置 ==================== -ENABLE_TRAFFIC = True # 是否启用交通流(暂时关闭,避免干扰) +ENABLE_TRAFFIC = False # 是否启用交通流(暂时关闭,避免干扰) TRAFFIC_VEHICLES = 30 # 交通车辆数量 TRAFFIC_WALKERS = 50 # 交通行人数量 TRAFFIC_SAFE_MODE = True # 交通安全模式 @@ -161,4 +161,4 @@ def print_config(): print(f" 固定时间步长: {FIXED_DELTA_SECONDS}s") print(f" 同步模式: {'开启' if SYNCHRONOUS_MODE else '关闭'}") - print("="*60) + print("="*60) \ No newline at end of file diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config_manager.py index a32097ae8d..6cb8308231 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config_manager.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config_manager.py @@ -371,4 +371,4 @@ def get_current_settings(self): 'fps': 1.0 / settings.fixed_delta_seconds if settings.fixed_delta_seconds else 0, 'tile_stream_distance': settings.tile_stream_distance, 'actor_active_distance': settings.actor_active_distance - } + } \ No newline at end of file diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/model_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/model_manager.py index f40c6a731a..7e2df5ae2b 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/model_manager.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/model_manager.py @@ -150,4 +150,4 @@ def get_model_info(self): 'braking_model_path': cfg.MODEL_PATHS['braking'] if self.braking_model else None, 'driving_model_path': cfg.MODEL_PATHS['driving'] if self.driving_model else None } - return info + return info \ No newline at end of file diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/traffic_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/traffic_manager.py index 09cb1e70ed..4ecf949f90 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/traffic_manager.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/traffic_manager.py @@ -181,4 +181,4 @@ def cleanup(self): all_actors[i].stop() # 销毁所有行人相关actor - self.client.apply_batch([carla.command.DestroyActor(x) for x in self.all_id]) + self.client.apply_batch([carla.command.DestroyActor(x) for x in self.all_id]) \ No newline at end of file diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/trajectory_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/trajectory_manager.py index 84c53162c7..a960e58821 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/trajectory_manager.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/trajectory_manager.py @@ -4,7 +4,6 @@ import carla import math -import config as cfg class TrajectoryManager: """轨迹管理器""" @@ -104,4 +103,4 @@ def get_route_info(self): 'has_route': True, 'start_point': self.route_points[0] if self.route_points else None, 'end_point': self.route_points[-1] if self.route_points else None - } + } \ No newline at end of file