diff --git a/src/Car-Racing/CMakeLists.txt b/src/Car-Racing/CMakeLists.txt new file mode 100644 index 0000000000..7a43ba5534 --- /dev/null +++ b/src/Car-Racing/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 2.8.3) +project(car_racing_ros) + +find_package(catkin REQUIRED COMPONENTS + rospy + std_msgs +) + +catkin_package( + CATKIN_DEPENDS rospy std_msgs +) + +include_directories( + ${catkin_INCLUDE_DIRS} +) + +# 标记脚本为可执行 +catkin_install_python(PROGRAMS scripts/car_racing_node.py + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) diff --git a/src/Car-Racing/.gitignore b/src/Car-Racing/car_racing_ros/.gitignore similarity index 100% rename from src/Car-Racing/.gitignore rename to src/Car-Racing/car_racing_ros/.gitignore diff --git a/src/Car-Racing/README.md b/src/Car-Racing/car_racing_ros/README.md similarity index 100% rename from src/Car-Racing/README.md rename to src/Car-Racing/car_racing_ros/README.md diff --git a/src/Car-Racing/configs/double_dqn.yaml b/src/Car-Racing/car_racing_ros/configs/double_dqn.yaml similarity index 100% rename from src/Car-Racing/configs/double_dqn.yaml rename to src/Car-Racing/car_racing_ros/configs/double_dqn.yaml diff --git a/src/Car-Racing/configs/dqn.yaml b/src/Car-Racing/car_racing_ros/configs/dqn.yaml similarity index 100% rename from src/Car-Racing/configs/dqn.yaml rename to src/Car-Racing/car_racing_ros/configs/dqn.yaml diff --git a/src/Car-Racing/doubledqn_model/double_dqn.py b/src/Car-Racing/car_racing_ros/doubledqn_model/double_dqn.py similarity index 100% rename from src/Car-Racing/doubledqn_model/double_dqn.py rename to src/Car-Racing/car_racing_ros/doubledqn_model/double_dqn.py diff --git a/src/Car-Racing/doubledqn_model/eval_doubledqn.py b/src/Car-Racing/car_racing_ros/doubledqn_model/eval_doubledqn.py similarity index 100% rename from src/Car-Racing/doubledqn_model/eval_doubledqn.py rename to src/Car-Racing/car_racing_ros/doubledqn_model/eval_doubledqn.py diff --git a/src/Car-Racing/doubledqn_model/training_double_dqn.py b/src/Car-Racing/car_racing_ros/doubledqn_model/training_double_dqn.py similarity index 100% rename from src/Car-Racing/doubledqn_model/training_double_dqn.py rename to src/Car-Racing/car_racing_ros/doubledqn_model/training_double_dqn.py diff --git a/src/Car-Racing/dqn_model/DQN_model.py b/src/Car-Racing/car_racing_ros/dqn_model/DQN_model.py similarity index 100% rename from src/Car-Racing/dqn_model/DQN_model.py rename to src/Car-Racing/car_racing_ros/dqn_model/DQN_model.py diff --git a/src/Car-Racing/dqn_model/eval_dqn.py b/src/Car-Racing/car_racing_ros/dqn_model/eval_dqn.py similarity index 100% rename from src/Car-Racing/dqn_model/eval_dqn.py rename to src/Car-Racing/car_racing_ros/dqn_model/eval_dqn.py diff --git a/src/Car-Racing/dqn_model/training_dqn.py b/src/Car-Racing/car_racing_ros/dqn_model/training_dqn.py similarity index 100% rename from src/Car-Racing/dqn_model/training_dqn.py rename to src/Car-Racing/car_racing_ros/dqn_model/training_dqn.py diff --git a/src/Car-Racing/gpucheck.txt b/src/Car-Racing/car_racing_ros/gpucheck.txt similarity index 100% rename from src/Car-Racing/gpucheck.txt rename to src/Car-Racing/car_racing_ros/gpucheck.txt diff --git a/src/Car-Racing/plot_comparison.py b/src/Car-Racing/car_racing_ros/plot_comparison.py similarity index 100% rename from src/Car-Racing/plot_comparison.py rename to src/Car-Racing/car_racing_ros/plot_comparison.py diff --git a/src/Car-Racing/requirements.txt b/src/Car-Racing/car_racing_ros/requirements.txt similarity index 100% rename from src/Car-Racing/requirements.txt rename to src/Car-Racing/car_racing_ros/requirements.txt diff --git a/src/Car-Racing/package.xml b/src/Car-Racing/package.xml new file mode 100644 index 0000000000..53b57aae6d --- /dev/null +++ b/src/Car-Racing/package.xml @@ -0,0 +1,18 @@ + + + car_racing_ros + 0.0.0 + CarRacing项目ROS封装(应付提交版) + your_name + MIT + + catkin + rospy + std_msgs + rospy + std_msgs + + + catkin + + diff --git a/src/Car-Racing/scripts/car_racing_node.py b/src/Car-Racing/scripts/car_racing_node.py new file mode 100644 index 0000000000..c51cd61e4c --- /dev/null +++ b/src/Car-Racing/scripts/car_racing_node.py @@ -0,0 +1,44 @@ +import rospy +import sys +from std_msgs.msg import Float32, String + +# 导入同功能包内的你的原代码(不用跨目录,ROS封装的核心) +sys.path.append("/home/ros-industrial/catkin_ws/src/car_racing_ros/your_python_code") + +from dqn_model.DQN_model import Agent as DQNAgent +from double_dqn_model.double_dqn import DoubleDQNAgent as DDQNAgent +from compare_models import evaluate_ddqn # 评估函数 + +# ROS节点 +class CarRacingROS: + def __init__(self): + # 初始化ROS节点 + rospy.init_node('car_racing_ros_node', anonymous=True) + self.avg_score_pub = rospy.Publisher('/car/avg_score', Float32, queue_size=10) + self.status_pub = rospy.Publisher('/car/status', String, queue_size=10) + + # 加载原代码模型 + self.agent = DDQNAgent( + state_space_shape=(4, 84, 84), + action_n=5, + load_state=True, + load_model='training/saved_models/DoubleDQN.pt' #原路径 + ) + rospy.loginfo("你的Python原代码模型加载完成") + + def run(self): + # 3. 运行原代码评估逻辑 + avg_score = evaluate_ddqn(self.agent, num_episodes=5) # 调用原函数 + + # 4. 把结果发布到ROS + self.avg_score_pub.publish(avg_score) + self.status_pub.publish(f"原代码评估完成,平均得分:{avg_score:.1f}") + rospy.loginfo(f"📌 ROS封装完成,评估得分:{avg_score:.1f}") + rospy.spin() # 保持节点运行 + +if __name__ == "__main__": + try: + ros_node = CarRacingROS() + ros_node.run() + except rospy.ROSInterruptException: + pass