From b36e5271b2aa7302b1ef8d9be2781f1daafc79dc Mon Sep 17 00:00:00 2001 From: yume <3545945359@qq.com> Date: Thu, 18 Dec 2025 14:03:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BD=BF=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=9B=B4=E6=B8=85=E6=99=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/Braking___282.model | Bin 0 -> 19104 bytes .../models/Driving__6030.model | Bin 0 -> 24376 bytes .../{ => test}/braking_dqn.py | 7 ++++++- .../{ => test}/driving_dqn.py | 5 +++++ .../{ => test}/pedestrians_1.py | 0 .../{ => test}/pedestrians_2.py | 0 .../{ => test}/test_braking.py | 7 ++++++- .../{ => test}/test_driving.py | 0 8 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Braking___282.model create mode 100644 src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Driving__6030.model rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => test}/braking_dqn.py (99%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => test}/driving_dqn.py (99%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => test}/pedestrians_1.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => test}/pedestrians_2.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => test}/test_braking.py (97%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => test}/test_driving.py (100%) diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Braking___282.model b/src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Braking___282.model new file mode 100644 index 0000000000000000000000000000000000000000..6345372b28af1650b3e2bc8dd58ef3a06f401d13 GIT binary patch literal 19104 zcmeHOU2GIp6u#RcRxDZ+LqWl1<4+&3-QBiysY+WYPz(wYV;V@ao$gNC3ESCbXBJvW zBM&}kVie;GFD4{tqHjEsXaEyUOdzq3Jo4a^iAfWE;0@2Y=bUb5cBfkkrL8-YvUl!1 z=bn4+H|LzW_uS$0f&RmrH|^M@@M>sK8&s3Nm7fQEU3rgMq%QPfzKL-88J9oQ(M?1( zD5N!WdlSo#)>A_>cl_wXLx&V_ihL=#+q?jgGv6NG)C2+phx$(7L9twQ zAv`j9d(;}kA*<>2CHf`H!&~v!Sq6L@g}@c$*Y`IP{Vo-%nqLpRLX12l_X>+zLBQ|V zQJ(k}wj;qIYub*PNL%(~(Zx2Zm;5Ouj7u!VuZPiz;kwAO|Q>eT>VoJ<%A2B51l0LsXGQF)D#n4Yvc0r%U98kZK7Y!AH>|j^R`CNgpxX z%s3fL+8H+{aj4UFF_+sDO%B0OS$A5u#b6SK+n&Vk&ZJRrka5(=IVLoSiXI(ifMD4p z`J$ao+b}P!?+~>5buQPoAI;dOsCNt`x&_0sjgcH`;ueai$Z}>=v@I8POG1Am<6378 z7hX=#5X)J%X=uQTj+q{@3}oYx;7w-3E7XF{mXX6(C(!(l^JAl68Ft1znE@7i%r_$k zT2c2zYaE8g$BToG8g|+^t9i4Q;})!uqUZyfj^+y!D8@0(EO6t4nn9pZxhl$>G7EXf ztAg&zGbxy3#T@8MGa(Bgu@xyADa)NsSERB`uws}2JSCTP6-~6pi&_Cx_F z_`5JOG&D3b1j2NnOPAcCVuvB*%oknofC{XD2ucNkGfKxa^wS{!)$0+UODTRYVR$D8 zh6}OMifVx?d!4;6Yv^aWfFXxgw6ArazPdWP+PhL+ok{bpcqbxfx<)zy4Dr?!bL>rY zrV<^=giw>33dA^EiDas)V{g2@9jI9|V@zuz+L}4(SUGLu36R|dEyjd1Rxr?{v`=fp z$mJb0_}B#b;)Dstn9*Jgev&B`jLdWlp>>Rj$(+e6$28k98xYEnH6_T>_KE=WbxnYl zhOi6~2oVSo2oVSo2oVSo2oVSoSOW;0{NQ+h1a|k5e@k&bMDhT`zWj*f6;cUOex8r( z7u(msq*g(NQr`8^^TD(SA1<;@5L8dvOrIJ>hL$c1_}l z#D}I`Bud6faeXjK?V{K0(_X%7oY$Q7=}TPy|6j>V`*A467d+Q#R&>HuN=$Ew_HYdE zRUOZ&jt88Ol{|Gha+TvtQ2ux}N)j%yplatj@z;q_o-=m~iyA?|ABV)+rlMW|C=FUV zcNp-JAG#*~!R#QMIi>ZTp0Wc?xEO^tw6{h-X%K)kki< zsc-ZNG~MCv3mhe|kA3Q;Z21XNiFYOLBA_jfE$<0=UYBDu+V$6{tQKFU-XOj(z7P(z z_Un%?Q3l{H+mGNO4l8x>ShPXBQdBJYm)1G>^#fg#Y_}rMZ^ug(Tw{#>_2R9z#Q_k! zhj%Z|S8LRF-P<>2>aO;D^Uv2k(LcVpdF1DPH(EZ~((}vPgv2YmkM!L6(Y*QZ+kfr< z_NzNRKb^XM^VeP9-z=WL-Ir}E_C2`zckg$<)%A@&Q#|nLpDhP!4Zm={Ap#)+Ap#)+ zAp+|Wf%5$&?W}_KvCH32&hmazR$_!!`F?V0RbedU$(r={&-x=R_(CmB-y&80{#k$L z#8aeipMv)FmA|vR&*vX4ydkKzkDcQUNaayh70Ph%CxAfEKK6?591TCILv_TSMK#%X zKI}eL@-D-^bGt@0S2a(z0|uA)!s&Y@CF7)!^We+TmuM`{v_j<^$;e8V{6Qvhw_#I_XUheJ^Y2r+#`1uo^L^#;0BjA6(h?U>>#cNqtOI#m#M9qWjcdCa3U+$x_ zn*9zQB)-8%)F*{BiyRey$Mtg#vT$5#*U#DY=mEd`-n@64%p_?b*dNWD zHgE2`ciy}AzI*R`@4lG_iwbWUJu-D9gRi6{CXq>zZsF%=dKt{524KLK(Hj*lx6$(8 zFmj_}k{FCr)A|(Jz9xZGsOf{tm(H8VAWCQ-O8QuL1JF))ef(xfXrO4Gu^0@^J@j8KlH_Nuh&WTpuD3U22L z<|<_4YelEvGS`Vtm#xNu>L;KMuqWYv(pM6?gL{U#37 z?MRMG+rg>`@HJX$hv>sn?_u!;_ss5jdjwH`OFBQWxBk6Wq%e}=dK&qXT1 zugkC#qpN}Tm&}w=KTJjzu4e4QdK5bxLbZsa3Bz28I!Z>RN=164(-;F~FrUC9eh&D= z_xSoH{2j9n{#i6ZYPQ=y2^9Tze!=axNs{0|g)Y#e6rT{BnXXTtjY z&I)_Y-S{b{TYf2iAh=#@u?sGjq&aP#M!N{dW$jFjmV_cyRjn#@wvmDRmos?#DN1b0>@ ze%w_nI9-^qLa@6;Q~@l?c-V*#Hb;4l$6+-)kX#bKrKncPb11ik*o+m7%KN}bw^Oh= zgmOFP#O?H8Mq-i1!z|QEv{swT?X;D9 zfE&bTMUAr>H{%jTE2753v=OTrGZ%%KJ4I)WOU{DyD3!!1R(kA+Um^(^f6{DNjHD-< zd%Za1u=Z1mDaqi=NW1L;w~Fj* zqZF^{w8un>=Mev)gn0m_<;irSsMiKo*g>IP9{i0~LGtb(0y~Z?bJFKXS8jH0R<0p8 zCsUlI!Sjchce;5J~7f!dNHn51d)(@59UK~?eFxCY`Hh-)COfw%_Z8i;G4Uo^06 z@$H2ww7ZApiGeN*ArGL;k3jxiGncRnbVU@dV*5pme(yApcfI(0Fj;fcgp5Km70OOw zox?al{-=2|A#9-ZB=5>ZK2M=^@nUFdK$&+1|5wv|JZJ^{yBI1ivLx{)q1%29Q%Hl* zPZ@<9G^8H*YNGi~p!3;AoM9s+R)pZ};CauOCu zV2{;sG}iM>_9!O%XPUTH(R_BOel9Eyoz;*QcG8BTo&S_vM+jk@>0|L?h-g3=hrrqz zHF5=zglXV>qDYRuU-shH8y`H#|n@cGXejHmtr=OR!NJ~K$7I8R4G zoW{YMfe4w5PP= z^KN*E5yJiy_B)*!Ju3k8y=_|0bVCiBG_J{a{NZujjt3WT?a$xko3XQrt8;7F9h)cn zmY({PZ{>z9+>3=DvhQV1=O#MZ*|#^;>W|z*x3sfm>QA_L*6;I{4X<~yU1NS= zU)ubXmouo@tR;uIA3HL=m3#JZk7RtCU$JK+n|-dG+t+xAdt|`_+{YOs*ze0XbIYs$ z%H2Btv$ocejhy$LJT7N$2fJqKV(!4^4)2#M>$#>c?)9EZOyyqx_aofzMm^1X&ZxYf zeywL8`)Cr^@p&3|YQ@9ccdvNa)!*{mQ|q2(7oSMsA1xZgRcMO2wGB6N!zbRu?b}SO zVACBUzwGh*@*iK~_PGxq#Y5St=`Tf-lun+$iIL6J6@(^jc?^$jPHp>TfOH_r}~yo8soFi z+U|ca>5$Jc<-L}--hb4eysgPw@~>ImaUUFN-Tlw}Hc!hM@6M(g-+Xhu@6~+=+NK?A zU=Ji*;VVo(>6^D(@PAy^;Ir>&Z*iR~^*6Td^#1RrXMDETzHYmGOcVPeztlIU#^B%n z-xBX*t$SNXP28N{b?mLSyd}+Ealh98T9?i@vte&@e(F^Jy}!45%g;REU-{v4zW=1W z(X!{-t^TZuHm~LI2;ZtBN7}yM@lF0yx4hsLJC=H1nDU0{)+u{UhwS&5W^Yd^NSK{c zz;2mZu%O{8)4QkMH0`%CtoYN_>}wM&?4p(o_Kq1Zv-6*CV!!gAojdos_WYE?$Jvpu z^Q=m@ifgHQk~^Kcmt+4tnQPhA#Wq!Tu`Qy>G-=C=Mz!Mw(~a)61z+r&W^8Gm$K6@? zoT>0{$9bRUO4G8_TTK(be28Co|Ehvi^H$@Cn_n`$@yv{Zk(Oh|gaZcSS1;>Lt5$TG z9&J9z&p0~WsQu=e!XMtvG+lReQ^700=_+u4u4mK#@CAQ-(&b#zx3}@k-;eOQpA{H4 zocjyE!hXQma%PRG{qY-k$M_7>6T_Z0@`-;m`4=uP=-9*zB`8Df8PGo4+D_cIU4s2)kjdYmiW` z_t5x4!T{v2z(3%9G9?^)yeT3bF^w{YLgP)94By*8r2JJw4(Yiumz2@+S7mbu9q6mK z`Hr_gur#2IFB;08pV|*_+uQl85^A@Qzf#&U@DVTN8c^o14(7@6N(lVCC|ijc+HmOn zB45A4yaHwH^GPS2Pp*q5B3bIfO&^*x1c&| z3Fn5&_tTP@-KuEky!h1;*dLFkJwb{2%&@u9SHJixrtZUCOa-iGNHo&7Qs`4I>G(H1 z%B)Ao2&l}+sI17S?8vB`$f((oQMr*(hRCQnkx_bGo-TsOdaRD~-)E2@2KJGF_9ys0 z1yvIak0AWLb)@s}AJQa(?vpwKg~t1x1TnyVBkeOfjZ`WcccaDUqw^^J0Fy7yPTy!i z8K24Oieb{I{QwurkOzLp1HlEBus$Zf$}oOvx6rQAj$!?vDIy&KT@i(=ZoNPTE)jC& z`vy(?B_dcKixIldAkzcnv6Sy!DdE`n9f>y(QRM>{IuBL#sYW8rFG_!lHor73B5Wu1 zDfjWt28srh^9#iBZHjme>;LY!evtx1vfreIq~SDbm&AUDMf_f(b1|WZ{YTjy1m1m- z{KX$192x-oEu)5cl(OBtx_9|k&g&3Ke$_J_tfzIwJ=3L8G{2;0I*3EXOM9mKrLm#wBO)2(Nnn15GWPXQAzcq?WFmyF zht|pPeGP=_gNz`o7eNn@msY~D>&Hs<(5D^R%Xco9_sES)I^!}uUE7{;fE!7x5D42JPJVK9sj2ZLdJA{Y$g qW58e-pZx{H_`pvFlT$tzFR&~8%s{yM&fc;Ig}wEiJ`96GAO8m_?|ni5 literal 0 HcmV?d00001 diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/braking_dqn.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/braking_dqn.py similarity index 99% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/braking_dqn.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/test/braking_dqn.py index 2e1714e262..2b318ef4e3 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/braking_dqn.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/braking_dqn.py @@ -11,7 +11,12 @@ 'win-amd64' if os.name == 'nt' else 'linux-x86_64'))[0]) except IndexError: pass - +# 获取当前文件的目录 +current_dir = os.path.dirname(os.path.abspath(__file__)) +# 获取父目录 +parent_dir = os.path.dirname(current_dir) +# 将父目录添加到系统路径 +sys.path.append(parent_dir) from agents.navigation.global_route_planner import GlobalRoutePlanner import carla diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/driving_dqn.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/driving_dqn.py similarity index 99% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/driving_dqn.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/test/driving_dqn.py index b9f79b123f..5bcaf60774 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/driving_dqn.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/driving_dqn.py @@ -12,6 +12,11 @@ except IndexError: pass +current_dir = os.path.dirname(os.path.abspath(__file__)) +# 获取父目录 +parent_dir = os.path.dirname(current_dir) +# 将父目录添加到系统路径 +sys.path.append(parent_dir) from agents.navigation.global_route_planner import GlobalRoutePlanner import carla diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/pedestrians_1.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/pedestrians_1.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/pedestrians_1.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/test/pedestrians_1.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/pedestrians_2.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/pedestrians_2.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/pedestrians_2.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/test/pedestrians_2.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/test_braking.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/test_braking.py similarity index 97% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/test_braking.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/test/test_braking.py index e89771a8bb..e70c63fefc 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/test_braking.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/test_braking.py @@ -1,4 +1,5 @@ import os +import sys os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2' # 只显示错误信息 import random from collections import deque @@ -13,11 +14,15 @@ from carla import Location from carla import Rotation +current_dir = os.path.dirname(os.path.abspath(__file__)) +base_dir = os.path.dirname(current_dir) +MODELS_DIR = os.path.join(base_dir, 'models') + town2 = {1: [53.12553405761719,137.06280517578125,1.3652913570404053, 0], 2:[105.81783294677734,97.80741882324219]} curves = [0, town2] epsilon = 0 -MODEL_PATH = "models/Braking___282.model" +MODEL_PATH = os.path.join(MODELS_DIR, 'Braking___282.model') def setup_tensorflow(): """设置 TensorFlow 2.x 配置""" diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/test_driving.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/test/test_driving.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/test_driving.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/test/test_driving.py From b65d3c1f6a2cec041dd7d2ec3761bc8a970cb0a8 Mon Sep 17 00:00:00 2001 From: yume <3545945359@qq.com> Date: Thu, 18 Dec 2025 17:22:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A6=82=E8=BF=B0:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复了无法生成行人的错误 修改的详细描述 修复了无法生成行人的错误 经过了什么样的测试? 操作系统 Ubuntu20.04 Python版本等python3.7 运行效果 动图、视频、截图等 Peek 2025-12-17 15-56 --- .../car_env.py | 3 +- .../config.py | 21 +- .../main.py | 292 +++++------- .../route_visualizer.py | 2 +- .../traffic_manager.py | 423 +++++------------- 5 files changed, 252 insertions(+), 489 deletions(-) diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py index 0c5caf86d9..b9695d445c 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py @@ -12,7 +12,6 @@ 'win-amd64' if os.name == 'nt' else 'linux-x86_64'))[0]) except IndexError: pass - from agents.navigation.global_route_planner import GlobalRoutePlanner import carla @@ -420,7 +419,7 @@ def step(self, action, current_state): self.vehicle.apply_control(carla.VehicleControl(throttle=0, brake=1.0)) print("执行动作: 刹车") elif action == 1: - self.vehicle.apply_control(carla.VehicleControl(throttle=0.5, steer= 0*self.STEER_AMT)) + self.vehicle.apply_control(carla.VehicleControl(throttle=0.4, steer= 0*self.STEER_AMT)) print("执行动作: 直行") elif action == 2: self.vehicle.apply_control(carla.VehicleControl(throttle=0.1, steer=-0.3*self.STEER_AMT)) diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py index 195518bacc..21b193f802 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py @@ -1,7 +1,7 @@ """ 配置文件 - 存储所有配置参数 """ - +import os # ==================== 轨迹配置 ==================== TRAJECTORIES = { "custom_trajectory": { @@ -27,9 +27,12 @@ def get_current_trajectory(): print(f"❌ 轨迹 '{CURRENT_TRAJECTORY}' 不存在") return None + # ==================== 模型配置 ==================== + + MODEL_PATHS = { - 'braking': "models/Braking___282.model", + 'braking': "models/Braking___282.model" , 'driving': "models/Driving__6030.model" } @@ -43,8 +46,8 @@ def get_current_trajectory(): # ==================== 交通配置 ==================== ENABLE_TRAFFIC = True # 是否启用交通流(暂时关闭,避免干扰) -TRAFFIC_VEHICLES = 15 # 交通车辆数量 -TRAFFIC_WALKERS = 20 # 交通行人数量 +TRAFFIC_VEHICLES = 30 # 交通车辆数量 +TRAFFIC_WALKERS = 50 # 交通行人数量 TRAFFIC_SAFE_MODE = True # 交通安全模式 TRAFFIC_HYBRID_MODE = True # 混合物理模式 TRAFFIC_SYNC_MODE = False # 交通同步模式 @@ -53,7 +56,7 @@ def get_current_trajectory(): # ==================== 可视化配置 ==================== ROUTE_COLOR = (255, 0, 0) # 路线颜色 (红色) PATH_COLOR = (0, 100, 255) # 路径颜色 (蓝色) -VEHICLE_COLOR = (0, 255, 0) # 车辆颜色 (绿色) +VEHICLE_COLOR = (0, 0, 0) # 车辆颜色 (绿色) ROUTE_HEIGHT = 0.3 # 路线显示高度 PATH_HEIGHT = 0.2 # 路径显示高度 @@ -62,16 +65,16 @@ def get_current_trajectory(): # ==================== 视角配置 ==================== TOP_DOWN_HEIGHT = 30.0 # 俯视视角高度(提高) TOP_DOWN_PITCH = -85.0 # 俯视角 (几乎垂直向下,-90是完全垂直) -SMOOTH_FOLLOW_FACTOR = 0.001 # 视角平滑系数 (0-1,越小越平滑) -MIN_SMOOTH_FACTOR = 0 # 最小平滑系数 +SMOOTH_FOLLOW_FACTOR = 0.01 # 视角平滑系数 (0-1,越小越平滑) +MIN_SMOOTH_FACTOR = 0.001 # 最小平滑系数 MAX_SMOOTH_FACTOR = 0.3 # 最大平滑系数 SMOOTH_FACTOR_ADAPTIVE = True # 是否自适应平滑系数 DISTANCE_THRESHOLD = 5.0 # 距离阈值,超过此值加大平滑系数 # ==================== 性能配置 ==================== DEBUG_MODE = True # 调试模式 -FPS_LIMIT = 0 # FPS限制 (0为无限制,提高性能) -UPDATE_RATE = 1.0 # 更新率 (1.0 = 每步更新) +FPS_LIMIT = 120 # FPS限制 (0为无限制,提高性能) +UPDATE_RATE = 0.5 # 更新率 (1.0 = 每步更新) USE_SMOOTH_INTERPOLATION = True # 使用平滑插值 INTERPOLATION_STEPS = 5 # 插值步数 MAX_FRAME_SKIP = 2 # 最大跳帧数 diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main.py index 69975cea17..1307269b1b 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main.py @@ -1,279 +1,217 @@ + +#!/usr/bin/env python3 """ -主程序入口 - 协调所有模块 +主程序 - 简化版 """ + import os os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2' import time +import sys +import glob + +# 导入CARLA +try: + sys.path.append(glob.glob('../carla/dist/carla-*%d.%d-%s.egg' % ( + sys.version_info.major, + sys.version_info.minor, + 'win-amd64' if os.name == 'nt' else 'linux-x86_64'))[0]) +except IndexError: + pass + +import carla import numpy as np from collections import deque from car_env import CarEnv from route_visualizer import RouteVisualizer from vehicle_tracker import VehicleTracker -from model_manager import ModelManager -from trajectory_manager import TrajectoryManager from traffic_manager import TrafficManager -from config_manager import ConfigManager import config as cfg def setup_environment(): - """设置整体环境""" - print("=" * 60) - print("CARLA自动驾驶系统启动") - print("=" * 60) + """设置环境""" + print("启动CARLA自动驾驶系统") - # 获取配置 + # 获取轨迹 trajectory = cfg.get_current_trajectory() - if trajectory is None: - print("❌ 无法获取轨迹配置") - return None, None, None, None, None, None, None + if not trajectory: + print("轨迹配置错误") + return None, None, None, None, None - print(f"📌 使用轨迹: {trajectory['description']}") + print(f"使用轨迹: {trajectory['description']}") - # 创建CARLA环境 + # 创建环境 try: env = CarEnv(trajectory['start'], trajectory['end']) - print("✅ CARLA环境创建成功") + print("CARLA环境创建成功") except Exception as e: - print(f"❌ 创建CARLA环境失败: {e}") - return None, None, None, None, None, None, None - - # 创建配置管理器 - config_mgr = ConfigManager(client=env.client) - - # 应用默认设置 - config_mgr.apply_default_settings() + print(f"创建环境失败: {e}") + return None, None, None, None, None - # 设置仿真参数(提高性能) + # 设置仿真参数 settings = env.world.get_settings() settings.fixed_delta_seconds = cfg.FIXED_DELTA_SECONDS - settings.synchronous_mode = cfg.SYNCHRONOUS_MODE - settings.no_rendering_mode = cfg.NO_RENDERING_MODE + settings.synchronous_mode = False + settings.no_rendering_mode = False env.world.apply_settings(settings) - print(f"📊 设置时间步长: {cfg.FIXED_DELTA_SECONDS}s ({1/cfg.FIXED_DELTA_SECONDS:.1f} FPS)") - - # 检查模拟器状态 - config_mgr.inspect_simulation() + # 设置天气 + env.world.set_weather(carla.WeatherParameters.ClearNoon) # 创建交通管理器 - traffic_mgr = TrafficManager(client=env.client) + traffic_mgr = TrafficManager(env.client, env.world) - # 生成交通流 + # 生成交通 if cfg.ENABLE_TRAFFIC: - print("\n🚦 生成交通流...") + print("生成交通流...") traffic_mgr.generate_traffic( num_vehicles=cfg.TRAFFIC_VEHICLES, num_walkers=cfg.TRAFFIC_WALKERS, - safe_mode=cfg.TRAFFIC_SAFE_MODE, - hybrid_mode=cfg.TRAFFIC_HYBRID_MODE, - sync_mode=cfg.TRAFFIC_SYNC_MODE, - respawn_vehicles=cfg.TRAFFIC_RESPAWN + safe_mode=cfg.TRAFFIC_SAFE_MODE ) - # 创建路线可视化器 + # 创建其他管理器 visualizer = RouteVisualizer(env.world) - - # 创建车辆跟踪器(控制视角) tracker = VehicleTracker(env.world) - # 创建模型管理器 - model_mgr = ModelManager() - - # 创建轨迹管理器 - traj_mgr = TrajectoryManager(env) - - return env, config_mgr, traffic_mgr, visualizer, tracker, model_mgr, traj_mgr + return env, traffic_mgr, visualizer, tracker, trajectory -def run_episode(env, config_mgr, traffic_mgr, visualizer, tracker, model_mgr, traj_mgr, episode_num): - """运行单个episode""" - print(f"\n{'='*60}") - print(f"Episode {episode_num}") - print(f"{'='*60}") +def load_models(): + """加载模型""" + try: + from tensorflow.keras.models import load_model + import tensorflow as tf + + braking_model = load_model(cfg.MODEL_PATHS['braking']) + driving_model = load_model(cfg.MODEL_PATHS['driving']) + + print("模型加载成功") + return braking_model, driving_model + except Exception as e: + print(f"模型加载失败: {e}") + return None, None + +def predict_action(braking_model, driving_model, current_state, vehicle_state=None): + """预测动作""" + if not braking_model or not driving_model: + return 0 + + # 刹车模型预测 + braking_state = np.array(current_state[:2]).reshape(1, -1) + braking_qs = braking_model.predict(braking_state, verbose=0)[0] + braking_action = np.argmax(braking_qs) + + # 如果安全,使用驾驶模型 + if braking_action == 1: + driving_state = np.array(current_state[2:]).reshape(1, -1) + driving_qs = driving_model.predict(driving_state, verbose=0)[0] + return np.argmax(driving_qs) + 1 + + return 0 + +def run_episode(env, traffic_mgr, visualizer, tracker, episode_num): + """运行一个episode""" + print(f"\nEpisode {episode_num}") + + # 加载模型 + braking_model, driving_model = load_models() + if not braking_model or not driving_model: + print("无法加载模型,退出") + return False # 重置环境 try: current_state = env.reset() - print(f"✅ 环境重置成功") + print("环境重置成功") except Exception as e: - print(f"❌ 环境重置失败: {e}") + print(f"环境重置失败: {e}") return False # 获取车辆 ego_vehicle = env.vehicle - if ego_vehicle is None: - print("❌ 未找到车辆") + if not ego_vehicle: + print("未找到车辆") return False - # 重置跟踪器 - tracker.reset() - - # 设置初始视角(俯视) - tracker.set_top_down_view(ego_vehicle, height=cfg.TOP_DOWN_HEIGHT) - - # 获取并绘制规划路线 - route_points = traj_mgr.get_route_points() - visualizer.draw_planned_route(route_points) + # 设置俯视视角 + tracker.set_top_down_view(ego_vehicle) - # 重置可视化器历史 - visualizer.reset_history() + # 绘制路线 + if hasattr(env, 'path') and env.path: + route_points = [] + for waypoint in env.path: + location = waypoint.transform.location + route_points.append((location.x, location.y, location.z)) + visualizer.draw_planned_route(route_points) - done = False + # 运行循环 step_count = 0 - frame_skip_count = 0 - fps_counter = deque(maxlen=120) # 增加历史长度 - last_frame_time = time.time() + done = False + fps_counter = deque(maxlen=30) while not done and step_count < cfg.MAX_STEPS_PER_EPISODE: step_count += 1 step_start = time.time() - current_time = time.time() - - # 计算帧间隔 - frame_interval = current_time - last_frame_time - last_frame_time = current_time - # 自适应跳帧逻辑 - should_skip_frame = False - if cfg.MAX_FRAME_SKIP > 0 and frame_interval > cfg.FIXED_DELTA_SECONDS * 1.5: - frame_skip_count += 1 - if frame_skip_count <= cfg.MAX_FRAME_SKIP: - should_skip_frame = True - if cfg.DEBUG_MODE and step_count % 50 == 0: - print(f"[跳过] 帧间隔过大: {frame_interval:.3f}s,跳过更新") - else: - frame_skip_count = 0 + # 每步都更新视角 + tracker.smooth_follow_vehicle(ego_vehicle) - # 更新交通管理器(如果是同步模式) - if traffic_mgr and cfg.TRAFFIC_SYNC_MODE and not should_skip_frame: - traffic_mgr.update() - - # 获取车辆状态 + # 更新车辆显示 vehicle_state = tracker.get_vehicle_state(ego_vehicle) - - # 更新视角(跳过某些帧时也更新,但减少频率) - if not should_skip_frame or step_count % 2 == 0: - tracker.smooth_follow_vehicle(ego_vehicle, height=cfg.TOP_DOWN_HEIGHT) - - # 更新车辆可视化(可以适当降低频率) - if vehicle_state and (step_count % 2 == 0 or not should_skip_frame): + if vehicle_state: visualizer.update_vehicle_display( vehicle_state['x'], vehicle_state['y'], vehicle_state['heading'] ) - # 模型预测动作 - action = model_mgr.predict_action(current_state, vehicle_state) + # 预测并执行动作 + action = predict_action(braking_model, driving_model, current_state, vehicle_state) - # 执行动作 try: new_state, reward, done, _ = env.step(action, current_state) current_state = new_state except Exception as e: - print(f"❌ 执行动作失败: {e}") + print(f"执行动作失败: {e}") done = True - # 显示进度 - if step_count % 100 == 0: - progress_info = tracker.calculate_progress( - vehicle_state['x'] if vehicle_state else 0, - vehicle_state['y'] if vehicle_state else 0, - route_points - ) - print(f"步骤 {step_count}, 奖励: {reward:.2f}, {progress_info}") - # 计算FPS frame_time = time.time() - step_start fps_counter.append(frame_time) - # 计算平滑FPS - if len(fps_counter) >= 30: - avg_frame_time = np.mean(list(fps_counter)[-30:]) - current_fps = 1.0 / avg_frame_time if avg_frame_time > 0 else 0 - else: - current_fps = len(fps_counter) / sum(fps_counter) if fps_counter else 0 - - # 显示调试信息 - if cfg.DEBUG_MODE and step_count % 100 == 0: - if vehicle_state: - print(f"[{step_count:4d}] FPS: {current_fps:5.1f} | " - f"动作: {cfg.ACTION_NAMES[action]} | " - f"位置: ({vehicle_state['x']:.1f}, {vehicle_state['y']:.1f}) | " - f"速度: {vehicle_state['speed_2d']:.1f}m/s") + if cfg.DEBUG_MODE and step_count % 50 == 0: + fps = len(fps_counter) / sum(fps_counter) if fps_counter else 0 + print(f"步骤 {step_count}, FPS: {fps:.1f}, 动作: {cfg.ACTION_NAMES[action]}") if done: - print(f"✅ Episode {episode_num} 完成,步数: {step_count}") + print(f"Episode {episode_num} 完成,步数: {step_count}") break - - # 限制帧率(如果需要) - if cfg.FPS_LIMIT > 0: - target_frame_time = 1.0 / cfg.FPS_LIMIT - actual_frame_time = time.time() - step_start - if actual_frame_time < target_frame_time: - time.sleep(target_frame_time - actual_frame_time) - - if step_count >= cfg.MAX_STEPS_PER_EPISODE: - print(f"⏰ Episode {episode_num} 达到最大步数限制") - - # 显示统计信息 - path_length = visualizer.calculate_path_length() - avg_fps = 1.0 / (sum(fps_counter) / len(fps_counter)) if fps_counter else 0 - print(f"📊 行驶距离: {path_length:.1f}m, 平均FPS: {avg_fps:.1f}") return True def main(): """主函数""" - # 初始化各模块 + # 设置环境 result = setup_environment() - if result[0] is None: - return - - env, config_mgr, traffic_mgr, visualizer, tracker, model_mgr, traj_mgr = result - - # 加载模型 - if not model_mgr.load_models(): - print("❌ 模型加载失败") + if not result[0]: return - print("\n🚗 开始自动驾驶...") + env, traffic_mgr, visualizer, tracker, trajectory = result - # 运行多个episode + # 运行episode for episode in range(cfg.TOTAL_EPISODES): - success = run_episode( - env, config_mgr, traffic_mgr, visualizer, tracker, model_mgr, traj_mgr, episode + 1 - ) - - if not success: - print(f"❌ Episode {episode + 1} 运行失败") + success = run_episode(env, traffic_mgr, visualizer, tracker, episode + 1) - # 等待片刻再开始下一个episode if episode < cfg.TOTAL_EPISODES - 1: - print(f"\n等待 {cfg.EPISODE_INTERVAL} 秒开始下一个episode...") + print(f"等待 {cfg.EPISODE_INTERVAL} 秒...") time.sleep(cfg.EPISODE_INTERVAL) # 清理 - print("\n" + "=" * 60) - print("所有episode完成!") - print("=" * 60) - - # 清理交通流 if traffic_mgr: traffic_mgr.cleanup() - # 显示最终统计 - print("\n📈 最终统计:") - print(f"总episodes: {cfg.TOTAL_EPISODES}") - print(f"每episode最大步数: {cfg.MAX_STEPS_PER_EPISODE}") - print(f"交通模式: {'启用' if cfg.ENABLE_TRAFFIC else '禁用'}") - - if cfg.ENABLE_TRAFFIC and traffic_mgr: - traffic_info = traffic_mgr.get_traffic_info() - print(f"交通车辆数: {traffic_info['num_vehicles']}") - print(f"交通行人数: {traffic_info['num_walkers']}") - - print("程序结束") + print("\n程序结束") if __name__ == '__main__': main() diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/route_visualizer.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/route_visualizer.py index add06ba397..d2dd0ff3fb 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/route_visualizer.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/route_visualizer.py @@ -183,7 +183,7 @@ def _draw_vehicle_outline(self, x, y, heading): for i in range(len(points) - 1): self.world.debug.draw_line( points[i], points[i+1], - thickness=0.15, + thickness=0.01, color=carla.Color(50, 255, 50), # 亮绿色轮廓 life_time=0.5, persistent_lines=False diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/traffic_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/traffic_manager.py index 583e4a9d2d..584670f20f 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/traffic_manager.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/traffic_manager.py @@ -1,15 +1,12 @@ + """ -交通管理器 - 封装generate_traffic.py功能,生成和管理交通流 +交通管理器 - 简化版 """ import sys import os import glob -import time -import logging -from numpy import random -# 添加CARLA路径 try: sys.path.append(glob.glob('../carla/dist/carla-*%d.%d-%s.egg' % ( sys.version_info.major, @@ -19,343 +16,169 @@ pass import carla -from carla import VehicleLightState as vls +from numpy import random class TrafficManager: - """交通管理器 - 负责生成和控制交通流""" + """交通管理器""" - def __init__(self, client=None, host='localhost', port=2000): - """ - 初始化交通管理器 - - Args: - client: 可选的CARLA客户端对象 - host: CARLA服务器主机 - port: CARLA服务器端口 - """ - if client: - self.client = client - self.world = client.get_world() - else: - self.client = carla.Client(host, port) - self.client.set_timeout(10.0) - self.world = self.client.get_world() - + def __init__(self, client, world): + self.client = client + self.world = world self.tm_port = 8000 - self.traffic_manager = None self.vehicles_list = [] self.walkers_list = [] - self.all_actors = [] self.all_id = [] - self.is_synchronous = False - self.synchronous_master = False + def generate_traffic(self, num_vehicles=15, num_walkers=20, safe_mode=True): + """生成交通流""" + print(f"生成交通: {num_vehicles}辆车, {num_walkers}个行人") - print("🚦 交通管理器初始化完成") - - def generate_traffic(self, - num_vehicles=20, - num_walkers=30, - safe_mode=True, - hybrid_mode=True, - sync_mode=False, - respawn_vehicles=False): - """ - 生成交通流 + # 获取交通管理器 + traffic_manager = self.client.get_trafficmanager(self.tm_port) + traffic_manager.set_global_distance_to_leading_vehicle(2.5) - Args: - num_vehicles: 车辆数量 - num_walkers: 行人数量 - safe_mode: 安全模式(避免事故倾向车辆) - hybrid_mode: 混合物理模式 - sync_mode: 同步模式 - respawn_vehicles: 是否重生休眠车辆 - - Returns: - bool: 是否成功 - """ - print("\n" + "="*50) - print("生成交通流") - print("="*50) - print(f"车辆: {num_vehicles}辆") - print(f"行人: {num_walkers}个") - print(f"安全模式: {'开启' if safe_mode else '关闭'}") - print(f"混合模式: {'开启' if hybrid_mode else '关闭'}") - print(f"同步模式: {'开启' if sync_mode else '关闭'}") + # 生成车辆 + self._spawn_vehicles(traffic_manager, num_vehicles, safe_mode) - try: - # 获取交通管理器 - self.traffic_manager = self.client.get_trafficmanager(self.tm_port) - - # 配置交通管理器 - self.traffic_manager.set_global_distance_to_leading_vehicle(2.5) - - if respawn_vehicles: - self.traffic_manager.set_respawn_dormant_vehicles(True) - - if hybrid_mode: - self.traffic_manager.set_hybrid_physics_mode(True) - self.traffic_manager.set_hybrid_physics_radius(70.0) - - # 设置仿真模式 - self.is_synchronous = sync_mode - settings = self.world.get_settings() - - if sync_mode: - self.traffic_manager.set_synchronous_mode(True) - if not settings.synchronous_mode: - self.synchronous_master = True - settings.synchronous_mode = True - settings.fixed_delta_seconds = 0.05 - else: - self.synchronous_master = False - - self.world.apply_settings(settings) - print("✅ 同步模式已启用") - - # 生成车辆 - self._spawn_vehicles(num_vehicles, safe_mode) - - # 生成行人 - self._spawn_walkers(num_walkers) - - # 配置交通管理器参数 - self.traffic_manager.global_percentage_speed_difference(30.0) - - print(f"\n✅ 交通流生成完成!") - print(f" 生成车辆: {len(self.vehicles_list)}辆") - print(f" 生成行人: {len(self.walkers_list)}个") - - return True - - except Exception as e: - print(f"❌ 生成交通流失败: {e}") - return False + # 生成行人 + if num_walkers > 0: + self._spawn_walkers_simple(num_walkers) + + print(f"完成: {len(self.vehicles_list)}辆车, {len(self.walkers_list)}个行人") + return True - def _spawn_vehicles(self, num_vehicles, safe_mode): + def _spawn_vehicles(self, traffic_manager, num_vehicles, safe_mode): """生成车辆""" - print("🚗 生成车辆...") - - # 获取车辆蓝图 blueprints = self.world.get_blueprint_library().filter('vehicle.*') if safe_mode: - # 过滤掉不安全或特殊车辆 - blueprints = [x for x in blueprints if int(x.get_attribute('number_of_wheels')) == 4] - blueprints = [x for x in blueprints if not x.id.endswith('microlino')] - blueprints = [x for x in blueprints if not x.id.endswith('carlacola')] - blueprints = [x for x in blueprints if not x.id.endswith('cybertruck')] - blueprints = [x for x in blueprints if not x.id.endswith('t2')] - blueprints = [x for x in blueprints if not x.id.endswith('sprinter')] - blueprints = [x for x in blueprints if not x.id.endswith('firetruck')] - blueprints = [x for x in blueprints if not x.id.endswith('ambulance')] + # 过滤危险车辆 + safe_vehicles = [ + 'vehicle.audi.a2', + 'vehicle.audi.tt', + 'vehicle.bmw.grandtourer', + 'vehicle.dodge.charger_police', + 'vehicle.jeep.wrangler_rubicon', + 'vehicle.lincoln.mkz2017', + 'vehicle.mercedes-benz.coupe', + 'vehicle.mini.cooperst', + 'vehicle.nissan.micra', + 'vehicle.nissan.patrol', + 'vehicle.seat.leon', + 'vehicle.tesla.model3', + 'vehicle.toyota.prius', + 'vehicle.volkswagen.t2' + ] + blueprints = [bp for bp in blueprints if any(safe in bp.id for safe in safe_vehicles)] - blueprints = sorted(blueprints, key=lambda bp: bp.id) - - # 获取生成点 spawn_points = self.world.get_map().get_spawn_points() random.shuffle(spawn_points) - if num_vehicles > len(spawn_points): - print(f"⚠️ 请求的车辆数({num_vehicles})超过生成点数({len(spawn_points)})") - num_vehicles = len(spawn_points) - - # 批量生成车辆 batch = [] - for n, transform in enumerate(spawn_points): - if n >= num_vehicles: - break - + for i in range(min(num_vehicles, len(spawn_points))): blueprint = random.choice(blueprints) - - # 设置随机颜色 - if blueprint.has_attribute('color'): - color = random.choice(blueprint.get_attribute('color').recommended_values) - blueprint.set_attribute('color', color) - - # 设置驾驶员ID - if blueprint.has_attribute('driver_id'): - driver_id = random.choice(blueprint.get_attribute('driver_id').recommended_values) - blueprint.set_attribute('driver_id', driver_id) - - blueprint.set_attribute('role_name', 'autopilot') - - # 添加到批量命令 - batch.append(carla.command.SpawnActor(blueprint, transform) - .then(carla.command.SetAutopilot( - carla.command.FutureActor, - True, - self.traffic_manager.get_port()))) - - # 执行批量命令 - for response in self.client.apply_batch_sync(batch, self.synchronous_master): - if response.error: - logging.error(f"生成车辆失败: {response.error}") - else: + batch.append( + carla.command.SpawnActor(blueprint, spawn_points[i]) + .then(carla.command.SetAutopilot(carla.command.FutureActor, True, traffic_manager.get_port())) + ) + + # 批量生成 + for response in self.client.apply_batch_sync(batch): + if not response.error: self.vehicles_list.append(response.actor_id) - - print(f"✅ 生成 {len(self.vehicles_list)} 辆车辆") - def _spawn_walkers(self, num_walkers): - """生成行人""" - print("🚶 生成行人...") - - if num_walkers <= 0: - return - - # 获取行人蓝图 + def _spawn_walkers_simple(self, num_walkers): + """简化的行人生成""" walker_bps = self.world.get_blueprint_library().filter('walker.pedestrian.*') - # 获取随机位置 - spawn_points = [] - for i in range(num_walkers): - spawn_point = carla.Transform() - loc = self.world.get_random_location_from_navigation() - if loc: - spawn_point.location = loc - spawn_points.append(spawn_point) - # 生成行人 batch = [] walker_speeds = [] - for spawn_point in spawn_points: - walker_bp = random.choice(walker_bps) - - # 设置为非无敌 - if walker_bp.has_attribute('is_invincible'): - walker_bp.set_attribute('is_invincible', 'false') - - # 设置速度 - speed = 0.0 - if walker_bp.has_attribute('speed'): - speed = walker_bp.get_attribute('speed').recommended_values[1] # 正常行走速度 - - walker_speeds.append(speed) - batch.append(carla.command.SpawnActor(walker_bp, spawn_point)) - - # 执行批量命令 - results = self.client.apply_batch_sync(batch, True) - for i in range(len(results)): - if results[i].error: - logging.error(f"生成行人失败: {results[i].error}") - else: - self.walkers_list.append({"id": results[i].actor_id}) + for i in range(num_walkers): + spawn_location = self.world.get_random_location_from_navigation() + if spawn_location and spawn_location.z < 5: # 确保位置合理 + walker_bp = random.choice(walker_bps) + + # 设置为非无敌 + if walker_bp.has_attribute('is_invincible'): + walker_bp.set_attribute('is_invincible', 'false') + + # 设置速度 + speed = 1.0 # 默认速度 + if walker_bp.has_attribute('speed'): + speed = walker_bp.get_attribute('speed').recommended_values[1] + + walker_speeds.append(speed) + batch.append(carla.command.SpawnActor(walker_bp, carla.Transform(spawn_location))) + + # 生成行人实体 + walker_ids = [] + results = self.client.apply_batch_sync(batch) + + for i, response in enumerate(results): + if not response.error: + walker_id = response.actor_id + walker_ids.append(walker_id) + self.walkers_list.append({ + "id": walker_id, + "speed": walker_speeds[i] if i < len(walker_speeds) else 1.0 + }) # 生成行人控制器 batch = [] - walker_controller_bp = self.world.get_blueprint_library().find('controller.ai.walker') + controller_bp = self.world.get_blueprint_library().find('controller.ai.walker') - for i in range(len(self.walkers_list)): - batch.append(carla.command.SpawnActor( - walker_controller_bp, - carla.Transform(), - self.walkers_list[i]["id"])) + for walker_info in self.walkers_list: + batch.append(carla.command.SpawnActor(controller_bp, carla.Transform(), walker_info["id"])) - results = self.client.apply_batch_sync(batch, True) + results = self.client.apply_batch_sync(batch) - for i in range(len(results)): - if results[i].error: - logging.error(f"生成行人控制器失败: {results[i].error}") - else: - self.walkers_list[i]["con"] = results[i].actor_id - self.all_id.append(results[i].actor_id) + for i, response in enumerate(results): + if not response.error and i < len(self.walkers_list): + self.walkers_list[i]["con"] = response.actor_id + self.all_id.append(response.actor_id) self.all_id.append(self.walkers_list[i]["id"]) - # 获取所有行人actor + # 初始化控制器 all_actors = self.world.get_actors(self.all_id) - # 初始化控制器 for i in range(0, len(self.all_id), 2): - # 启动控制器 - all_actors[i].start() - # 设置随机目标 - all_actors[i].go_to_location(self.world.get_random_location_from_navigation()) - # 设置最大速度 - all_actors[i].set_max_speed(float(walker_speeds[int(i/2)])) - - print(f"✅ 生成 {len(self.walkers_list)} 个行人") - - def update(self): - """更新交通管理器(用于同步模式)""" - if self.is_synchronous and self.synchronous_master: - self.world.tick() - elif self.is_synchronous: - self.world.wait_for_tick() - - def set_vehicle_lights(self, enabled=True): - """设置车辆灯光""" - if not self.vehicles_list: - return - - try: - all_vehicle_actors = self.world.get_actors(self.vehicles_list) - for actor in all_vehicle_actors: - self.traffic_manager.update_vehicle_lights(actor, enabled) - - print(f"✅ 车辆灯光 {'开启' if enabled else '关闭'}") - except Exception as e: - print(f"⚠️ 设置车辆灯光失败: {e}") - - def set_global_speed_limit(self, percentage=30.0): - """设置全局速度限制百分比""" - if self.traffic_manager: - self.traffic_manager.global_percentage_speed_difference(percentage) - print(f"✅ 设置全局速度限制: {percentage}%") + if i < len(all_actors): + controller = all_actors[i] + walker = all_actors[i+1] if i+1 < len(all_actors) else None + + if controller and walker: + try: + controller.start() + + # 设置目的地 + target = self.world.get_random_location_from_navigation() + if target: + controller.go_to_location(target) + + # 设置速度 + walker_index = i // 2 + if walker_index < len(self.walkers_list): + controller.set_max_speed(self.walkers_list[walker_index]["speed"]) + except: + pass def cleanup(self): - """清理所有生成的交通""" - print("\n🧹 清理交通流...") - - try: - # 停止同步模式 - if self.is_synchronous and self.synchronous_master: - settings = self.world.get_settings() - settings.synchronous_mode = False - settings.fixed_delta_seconds = None - self.world.apply_settings(settings) - - # 销毁车辆 - if self.vehicles_list: - print(f"销毁 {len(self.vehicles_list)} 辆车辆...") - self.client.apply_batch([ - carla.command.DestroyActor(x) for x in self.vehicles_list - ]) - - # 销毁行人 - if self.all_id: - print(f"销毁 {len(self.walkers_list)} 个行人...") - - # 先停止控制器 - all_actors = self.world.get_actors(self.all_id) - for i in range(0, len(self.all_id), 2): + """清理交通""" + print("清理交通...") + + # 销毁车辆 + if self.vehicles_list: + self.client.apply_batch([carla.command.DestroyActor(x) for x in self.vehicles_list]) + + # 销毁行人 + if self.all_id: + # 先停止控制器 + all_actors = self.world.get_actors(self.all_id) + for i in range(0, len(self.all_id), 2): + if i < len(all_actors): all_actors[i].stop() - - # 销毁所有actor - self.client.apply_batch([ - carla.command.DestroyActor(x) for x in self.all_id - ]) - - # 清空列表 - self.vehicles_list = [] - self.walkers_list = [] - self.all_id = [] - print("✅ 交通流清理完成") - - except Exception as e: - print(f"❌ 清理交通流失败: {e}") - - def get_traffic_info(self): - """获取交通信息""" - return { - 'num_vehicles': len(self.vehicles_list), - 'num_walkers': len(self.walkers_list), - 'is_synchronous': self.is_synchronous, - 'tm_port': self.tm_port - } - - def __del__(self): - """析构函数,确保清理""" - if self.vehicles_list or self.walkers_list: - self.cleanup() + # 销毁所有行人相关actor + self.client.apply_batch([carla.command.DestroyActor(x) for x in self.all_id]) From 01c036266b03bbdec79cd74ac4590023c5cfcaca Mon Sep 17 00:00:00 2001 From: yume <3545945359@qq.com> Date: Thu, 18 Dec 2025 17:26:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BA=86README=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=90=AF=E5=8A=A8=E6=B5=81=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../README.md | 50 +++++++++++++++--- .../{ => main}/car_env.py | 7 +++ .../{ => main}/config.py | 12 +++-- .../{ => main}/config_manager.py | 0 .../{ => main}/get_location.py | 0 .../{ => main}/main.py | 0 .../{ => main}/model_manager.py | 0 .../{ => main}/route_visualizer.py | 0 .../{ => main}/traffic_manager.py | 0 .../{ => main}/trajectory_manager.py | 0 .../{ => main}/vehicle_tracker.py | 0 ...ax__282.00avg__282.00min__1679121006.model | Bin 19104 -> 0 bytes ...ax_6030.00avg_6030.00min__1679109656.model | Bin 24376 -> 0 bytes 13 files changed, 57 insertions(+), 12 deletions(-) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/car_env.py (99%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/config.py (93%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/config_manager.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/get_location.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/main.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/model_manager.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/route_visualizer.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/traffic_manager.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/trajectory_manager.py (100%) rename src/Autonomous_vehicle_navigation_using_deep_learning_master/{ => main}/vehicle_tracker.py (100%) delete mode 100644 src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Braking___282.00max__282.00avg__282.00min__1679121006.model delete mode 100644 src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Driving__6030.00max_6030.00avg_6030.00min__1679109656.model diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/README.md b/src/Autonomous_vehicle_navigation_using_deep_learning_master/README.md index 3a90822a45..4940205df8 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/README.md +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/README.md @@ -26,20 +26,54 @@ pip install -r requirements.txt 3. **运行主程序**: ```bash +cd main python main.py ``` +4. **运行测试程序**: +```bash +cd test +python test_driving.py +``` ## 项目结构 ``` -├── main.py # 主程序入口 -├── config.py # 配置文件 -├── get_location.py # 位置坐标获取工具 -├── test_braking.py # 刹车模型测试 -├── test_driving.py # 驾驶模型测试 -├── pedestrians_1.py # 行人生成器1 -├── pedestrians_2.py # 行人生成器2 -└── requirements.txt # 依赖包列表 +│ README.md +│ requirements.txt +├─agents +│ │ __init__.py +│ ├─navigation +│ │ basic_agent.py +│ │ behavior_agent.py +│ │ behavior_types.py +│ │ controller.py +│ │ global_route_planner.py +│ │ local_planner.py +│ │ __init__.py +│ └─tools +│ misc.py +│ __init__.py +├─main +│ car_env.py +│ config.py +│ config_manager.py +│ get_location.py +│ main.py +│ model_manager.py +│ route_visualizer.py +│ traffic_manager.py +│ trajectory_manager.py +│ vehicle_tracker.py +├─models +│ Braking___282.00max__282.00avg__282.00min__1679121006.model +│ Driving__6030.00max_6030.00avg_6030.00min__1679109656.model +└─test + braking_dqn.py + driving_dqn.py + pedestrians_1.py + pedestrians_2.py + test_braking.py + test_driving.py ``` ## 核心功能 diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py similarity index 99% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py index b9695d445c..13bdf2eb7a 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/car_env.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/car_env.py @@ -12,6 +12,13 @@ 'win-amd64' if os.name == 'nt' else 'linux-x86_64'))[0]) except IndexError: pass + +# 获取当前文件的目录 +current_dir = os.path.dirname(os.path.abspath(__file__)) +# 获取父目录 +parent_dir = os.path.dirname(current_dir) +# 将父目录添加到系统路径 +sys.path.append(parent_dir) from agents.navigation.global_route_planner import GlobalRoutePlanner import carla diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py similarity index 93% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py index 21b193f802..565a3cf51c 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/config.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config.py @@ -29,11 +29,15 @@ def get_current_trajectory(): # ==================== 模型配置 ==================== - - +# 设置基础路径 +current_dir = os.path.dirname(os.path.abspath(__file__)) +base_dir = os.path.dirname(current_dir) # 上一级目录 +MODELS_DIR = os.path.join(base_dir, 'models') +braking = os.path.join(MODELS_DIR, 'Braking___282.model') +driving = os.path.join(MODELS_DIR, 'Driving__6030.model') MODEL_PATHS = { - 'braking': "models/Braking___282.model" , - 'driving': "models/Driving__6030.model" + 'braking': braking , + 'driving': driving } # ==================== 动作配置 ==================== diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/config_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config_manager.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/config_manager.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/config_manager.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/get_location.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/get_location.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/get_location.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/get_location.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/main.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/main.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/main.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/model_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/model_manager.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/model_manager.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/model_manager.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/route_visualizer.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/route_visualizer.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/route_visualizer.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/route_visualizer.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/traffic_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/traffic_manager.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/traffic_manager.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/traffic_manager.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/trajectory_manager.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/trajectory_manager.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/trajectory_manager.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/trajectory_manager.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/vehicle_tracker.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/vehicle_tracker.py similarity index 100% rename from src/Autonomous_vehicle_navigation_using_deep_learning_master/vehicle_tracker.py rename to src/Autonomous_vehicle_navigation_using_deep_learning_master/main/vehicle_tracker.py diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Braking___282.00max__282.00avg__282.00min__1679121006.model b/src/Autonomous_vehicle_navigation_using_deep_learning_master/models/Braking___282.00max__282.00avg__282.00min__1679121006.model deleted file mode 100644 index 6345372b28af1650b3e2bc8dd58ef3a06f401d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19104 zcmeHOU2GIp6u#RcRxDZ+LqWl1<4+&3-QBiysY+WYPz(wYV;V@ao$gNC3ESCbXBJvW zBM&}kVie;GFD4{tqHjEsXaEyUOdzq3Jo4a^iAfWE;0@2Y=bUb5cBfkkrL8-YvUl!1 z=bn4+H|LzW_uS$0f&RmrH|^M@@M>sK8&s3Nm7fQEU3rgMq%QPfzKL-88J9oQ(M?1( zD5N!WdlSo#)>A_>cl_wXLx&V_ihL=#+q?jgGv6NG)C2+phx$(7L9twQ zAv`j9d(;}kA*<>2CHf`H!&~v!Sq6L@g}@c$*Y`IP{Vo-%nqLpRLX12l_X>+zLBQ|V zQJ(k}wj;qIYub*PNL%(~(Zx2Zm;5Ouj7u!VuZPiz;kwAO|Q>eT>VoJ<%A2B51l0LsXGQF)D#n4Yvc0r%U98kZK7Y!AH>|j^R`CNgpxX z%s3fL+8H+{aj4UFF_+sDO%B0OS$A5u#b6SK+n&Vk&ZJRrka5(=IVLoSiXI(ifMD4p z`J$ao+b}P!?+~>5buQPoAI;dOsCNt`x&_0sjgcH`;ueai$Z}>=v@I8POG1Am<6378 z7hX=#5X)J%X=uQTj+q{@3}oYx;7w-3E7XF{mXX6(C(!(l^JAl68Ft1znE@7i%r_$k zT2c2zYaE8g$BToG8g|+^t9i4Q;})!uqUZyfj^+y!D8@0(EO6t4nn9pZxhl$>G7EXf ztAg&zGbxy3#T@8MGa(Bgu@xyADa)NsSERB`uws}2JSCTP6-~6pi&_Cx_F z_`5JOG&D3b1j2NnOPAcCVuvB*%oknofC{XD2ucNkGfKxa^wS{!)$0+UODTRYVR$D8 zh6}OMifVx?d!4;6Yv^aWfFXxgw6ArazPdWP+PhL+ok{bpcqbxfx<)zy4Dr?!bL>rY zrV<^=giw>33dA^EiDas)V{g2@9jI9|V@zuz+L}4(SUGLu36R|dEyjd1Rxr?{v`=fp z$mJb0_}B#b;)Dstn9*Jgev&B`jLdWlp>>Rj$(+e6$28k98xYEnH6_T>_KE=WbxnYl zhOi6~2oVSo2oVSo2oVSo2oVSoSOW;0{NQ+h1a|k5e@k&bMDhT`zWj*f6;cUOex8r( z7u(msq*g(NQr`8^^TD(SA1<;@5L8dvOrIJ>hL$c1_}l z#D}I`Bud6faeXjK?V{K0(_X%7oY$Q7=}TPy|6j>V`*A467d+Q#R&>HuN=$Ew_HYdE zRUOZ&jt88Ol{|Gha+TvtQ2ux}N)j%yplatj@z;q_o-=m~iyA?|ABV)+rlMW|C=FUV zcNp-JAG#*~!R#QMIi>ZTp0Wc?xEO^tw6{h-X%K)kki< zsc-ZNG~MCv3mhe|kA3Q;Z21XNiFYOLBA_jfE$<0=UYBDu+V$6{tQKFU-XOj(z7P(z z_Un%?Q3l{H+mGNO4l8x>ShPXBQdBJYm)1G>^#fg#Y_}rMZ^ug(Tw{#>_2R9z#Q_k! zhj%Z|S8LRF-P<>2>aO;D^Uv2k(LcVpdF1DPH(EZ~((}vPgv2YmkM!L6(Y*QZ+kfr< z_NzNRKb^XM^VeP9-z=WL-Ir}E_C2`zckg$<)%A@&Q#|nLpDhP!4Zm={Ap#)+Ap#)+ zAp+|Wf%5$&?W}_KvCH32&hmazR$_!!`F?V0RbedU$(r={&-x=R_(CmB-y&80{#k$L z#8aeipMv)FmA|vR&*vX4ydkKzkDcQUNaayh70Ph%CxAfEKK6?591TCILv_TSMK#%X zKI}eL@-D-^bGt@0S2a(z0|uA)!s&Y@CF7)!^We+TmuM`{v_j<^$;e8V{6Qvhw_#I_XUheJ^Y2r+#`1uo^L^#;0BjA6(h?U>>#cNqtOI#m#M9qWjcdCa3U+$x_ zn*9zQB)-8%)F*{BiyRey$Mtg#vT$5#*U#DY=mEd`-n@64%p_?b*dNWD zHgE2`ciy}AzI*R`@4lG_iwbWUJu-D9gRi6{CXq>zZsF%=dKt{524KLK(Hj*lx6$(8 zFmj_}k{FCr)A|(Jz9xZGsOf{tm(H8VAWCQ-O8QuL1JF))ef(xfXrO4Gu^0@^J@j8KlH_Nuh&WTpuD3U22L z<|<_4YelEvGS`Vtm#xNu>L;KMuqWYv(pM6?gL{U#37 z?MRMG+rg>`@HJX$hv>sn?_u!;_ss5jdjwH`OFBQWxBk6Wq%e}=dK&qXT1 zugkC#qpN}Tm&}w=KTJjzu4e4QdK5bxLbZsa3Bz28I!Z>RN=164(-;F~FrUC9eh&D= z_xSoH{2j9n{#i6ZYPQ=y2^9Tze!=axNs{0|g)Y#e6rT{BnXXTtjY z&I)_Y-S{b{TYf2iAh=#@u?sGjq&aP#M!N{dW$jFjmV_cyRjn#@wvmDRmos?#DN1b0>@ ze%w_nI9-^qLa@6;Q~@l?c-V*#Hb;4l$6+-)kX#bKrKncPb11ik*o+m7%KN}bw^Oh= zgmOFP#O?H8Mq-i1!z|QEv{swT?X;D9 zfE&bTMUAr>H{%jTE2753v=OTrGZ%%KJ4I)WOU{DyD3!!1R(kA+Um^(^f6{DNjHD-< zd%Za1u=Z1mDaqi=NW1L;w~Fj* zqZF^{w8un>=Mev)gn0m_<;irSsMiKo*g>IP9{i0~LGtb(0y~Z?bJFKXS8jH0R<0p8 zCsUlI!Sjchce;5J~7f!dNHn51d)(@59UK~?eFxCY`Hh-)COfw%_Z8i;G4Uo^06 z@$H2ww7ZApiGeN*ArGL;k3jxiGncRnbVU@dV*5pme(yApcfI(0Fj;fcgp5Km70OOw zox?al{-=2|A#9-ZB=5>ZK2M=^@nUFdK$&+1|5wv|JZJ^{yBI1ivLx{)q1%29Q%Hl* zPZ@<9G^8H*YNGi~p!3;AoM9s+R)pZ};CauOCu zV2{;sG}iM>_9!O%XPUTH(R_BOel9Eyoz;*QcG8BTo&S_vM+jk@>0|L?h-g3=hrrqz zHF5=zglXV>qDYRuU-shH8y`H#|n@cGXejHmtr=OR!NJ~K$7I8R4G zoW{YMfe4w5PP= z^KN*E5yJiy_B)*!Ju3k8y=_|0bVCiBG_J{a{NZujjt3WT?a$xko3XQrt8;7F9h)cn zmY({PZ{>z9+>3=DvhQV1=O#MZ*|#^;>W|z*x3sfm>QA_L*6;I{4X<~yU1NS= zU)ubXmouo@tR;uIA3HL=m3#JZk7RtCU$JK+n|-dG+t+xAdt|`_+{YOs*ze0XbIYs$ z%H2Btv$ocejhy$LJT7N$2fJqKV(!4^4)2#M>$#>c?)9EZOyyqx_aofzMm^1X&ZxYf zeywL8`)Cr^@p&3|YQ@9ccdvNa)!*{mQ|q2(7oSMsA1xZgRcMO2wGB6N!zbRu?b}SO zVACBUzwGh*@*iK~_PGxq#Y5St=`Tf-lun+$iIL6J6@(^jc?^$jPHp>TfOH_r}~yo8soFi z+U|ca>5$Jc<-L}--hb4eysgPw@~>ImaUUFN-Tlw}Hc!hM@6M(g-+Xhu@6~+=+NK?A zU=Ji*;VVo(>6^D(@PAy^;Ir>&Z*iR~^*6Td^#1RrXMDETzHYmGOcVPeztlIU#^B%n z-xBX*t$SNXP28N{b?mLSyd}+Ealh98T9?i@vte&@e(F^Jy}!45%g;REU-{v4zW=1W z(X!{-t^TZuHm~LI2;ZtBN7}yM@lF0yx4hsLJC=H1nDU0{)+u{UhwS&5W^Yd^NSK{c zz;2mZu%O{8)4QkMH0`%CtoYN_>}wM&?4p(o_Kq1Zv-6*CV!!gAojdos_WYE?$Jvpu z^Q=m@ifgHQk~^Kcmt+4tnQPhA#Wq!Tu`Qy>G-=C=Mz!Mw(~a)61z+r&W^8Gm$K6@? zoT>0{$9bRUO4G8_TTK(be28Co|Ehvi^H$@Cn_n`$@yv{Zk(Oh|gaZcSS1;>Lt5$TG z9&J9z&p0~WsQu=e!XMtvG+lReQ^700=_+u4u4mK#@CAQ-(&b#zx3}@k-;eOQpA{H4 zocjyE!hXQma%PRG{qY-k$M_7>6T_Z0@`-;m`4=uP=-9*zB`8Df8PGo4+D_cIU4s2)kjdYmiW` z_t5x4!T{v2z(3%9G9?^)yeT3bF^w{YLgP)94By*8r2JJw4(Yiumz2@+S7mbu9q6mK z`Hr_gur#2IFB;08pV|*_+uQl85^A@Qzf#&U@DVTN8c^o14(7@6N(lVCC|ijc+HmOn zB45A4yaHwH^GPS2Pp*q5B3bIfO&^*x1c&| z3Fn5&_tTP@-KuEky!h1;*dLFkJwb{2%&@u9SHJixrtZUCOa-iGNHo&7Qs`4I>G(H1 z%B)Ao2&l}+sI17S?8vB`$f((oQMr*(hRCQnkx_bGo-TsOdaRD~-)E2@2KJGF_9ys0 z1yvIak0AWLb)@s}AJQa(?vpwKg~t1x1TnyVBkeOfjZ`WcccaDUqw^^J0Fy7yPTy!i z8K24Oieb{I{QwurkOzLp1HlEBus$Zf$}oOvx6rQAj$!?vDIy&KT@i(=ZoNPTE)jC& z`vy(?B_dcKixIldAkzcnv6Sy!DdE`n9f>y(QRM>{IuBL#sYW8rFG_!lHor73B5Wu1 zDfjWt28srh^9#iBZHjme>;LY!evtx1vfreIq~SDbm&AUDMf_f(b1|WZ{YTjy1m1m- z{KX$192x-oEu)5cl(OBtx_9|k&g&3Ke$_J_tfzIwJ=3L8G{2;0I*3EXOM9mKrLm#wBO)2(Nnn15GWPXQAzcq?WFmyF zht|pPeGP=_gNz`o7eNn@msY~D>&Hs<(5D^R%Xco9_sES)I^!}uUE7{;fE!7x5D42JPJVK9sj2ZLdJA{Y$g qW58e-pZx{H_`pvFlT$tzFR&~8%s{yM&fc;Ig}wEiJ`96GAO8m_?|ni5 From 66065b8bcccf85819983d9f0ab41203b0b45cec2 Mon Sep 17 00:00:00 2001 From: yume <3545945359@qq.com> Date: Thu, 18 Dec 2025 21:33:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=A7=86?= =?UTF-8?q?=E8=A7=92=E5=8D=A1=E9=A1=BF=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E8=A7=86=E8=A7=92=E8=B7=9F=E9=9A=8F?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=A7=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/config.py | 23 +- .../main/main.py | 46 +-- .../main/traffic_manager.py | 2 +- .../main/vehicle_tracker.py | 269 ++++++++++++------ 4 files changed, 227 insertions(+), 113 deletions(-) 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 565a3cf51c..31b4533265 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 @@ -67,21 +67,26 @@ def get_current_trajectory(): VEHICLE_HEIGHT = 0.25 # 车辆显示高度 # ==================== 视角配置 ==================== -TOP_DOWN_HEIGHT = 30.0 # 俯视视角高度(提高) -TOP_DOWN_PITCH = -85.0 # 俯视角 (几乎垂直向下,-90是完全垂直) -SMOOTH_FOLLOW_FACTOR = 0.01 # 视角平滑系数 (0-1,越小越平滑) -MIN_SMOOTH_FACTOR = 0.001 # 最小平滑系数 +TOP_DOWN_HEIGHT = 5.0 # 俯视视角高度(提高) +TOP_DOWN_PITCH = -30.0 # 俯视角 (几乎垂直向下,-90是完全垂直) +SMOOTH_FOLLOW_FACTOR = 0.01 # 视角平滑系数 (0-1,越小越平滑) +MIN_SMOOTH_FACTOR = 0.001 # 最小平滑系数 MAX_SMOOTH_FACTOR = 0.3 # 最大平滑系数 SMOOTH_FACTOR_ADAPTIVE = True # 是否自适应平滑系数 -DISTANCE_THRESHOLD = 5.0 # 距离阈值,超过此值加大平滑系数 - +DISTANCE_THRESHOLD = 1.0 # 距离阈值,超过此值加大平滑系数 +FOLLOW_DISTANCE= 8.0 # 跟随距离(米) +FOLLOW_HEIGHT = 3.0 # 跟随高度(米) +FOLLOW_PITCH = -20.0 # 俯视角(度) +VIEW_UPDATE_ENABLED = True # 是否启用视角更新 +VIEW_UPDATE_FPS = 60 # 视角更新频率 (Hz) +VIEW_UPDATE_THREADED = True # 是否使用独立线程更新视角 # ==================== 性能配置 ==================== DEBUG_MODE = True # 调试模式 -FPS_LIMIT = 120 # FPS限制 (0为无限制,提高性能) +FPS_LIMIT = 60 # FPS限制 (0为无限制,提高性能) UPDATE_RATE = 0.5 # 更新率 (1.0 = 每步更新) USE_SMOOTH_INTERPOLATION = True # 使用平滑插值 INTERPOLATION_STEPS = 5 # 插值步数 -MAX_FRAME_SKIP = 2 # 最大跳帧数 +MAX_FRAME_SKIP = 1 # 最大跳帧数 # ==================== CARLA配置 ==================== CARLA_HOST = "localhost" @@ -89,7 +94,7 @@ def get_current_trajectory(): CARLA_TIMEOUT = 20.0 # ==================== 仿真配置 ==================== -FIXED_DELTA_SECONDS = 0.0166 # 固定时间步长 (~30 FPS) +FIXED_DELTA_SECONDS = 0.0166 # 固定时间步长 (~60 FPS) SYNCHRONOUS_MODE = False # 同步模式(影响性能,暂不启用) NO_RENDERING_MODE = False # 无渲染模式 diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/main.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/main.py index 1307269b1b..5dab272650 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/main.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/main.py @@ -1,4 +1,3 @@ - #!/usr/bin/env python3 """ 主程序 - 简化版 @@ -134,8 +133,8 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num): print("未找到车辆") return False - # 设置俯视视角 - tracker.set_top_down_view(ego_vehicle) + # 设置后方跟随视角(启动独立线程) + tracker.set_follow_view(ego_vehicle) # 绘制路线 if hasattr(env, 'path') and env.path: @@ -145,7 +144,7 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num): route_points.append((location.x, location.y, location.z)) visualizer.draw_planned_route(route_points) - # 运行循环 + # 运行循环 - 不再在主循环中更新视角 step_count = 0 done = False fps_counter = deque(maxlen=30) @@ -154,8 +153,8 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num): step_count += 1 step_start = time.time() - # 每步都更新视角 - tracker.smooth_follow_vehicle(ego_vehicle) + # 注意:不再调用 tracker.smooth_follow_vehicle(ego_vehicle) + # 视角更新由独立线程处理 # 更新车辆显示 vehicle_state = tracker.get_vehicle_state(ego_vehicle) @@ -182,12 +181,16 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num): if cfg.DEBUG_MODE and step_count % 50 == 0: fps = len(fps_counter) / sum(fps_counter) if fps_counter else 0 - print(f"步骤 {step_count}, FPS: {fps:.1f}, 动作: {cfg.ACTION_NAMES[action]}") + vehicle_speed = vehicle_state.get('speed_2d', 0) if vehicle_state else 0 + print(f"步骤 {step_count}, FPS: {fps:.1f}, 速度: {vehicle_speed:.1f}m/s, 动作: {cfg.ACTION_NAMES[action]}") if done: print(f"Episode {episode_num} 完成,步数: {step_count}") break + # 清理跟踪器资源 + tracker.cleanup() + return True def main(): @@ -199,19 +202,22 @@ def main(): env, traffic_mgr, visualizer, tracker, trajectory = result - # 运行episode - for episode in range(cfg.TOTAL_EPISODES): - success = run_episode(env, traffic_mgr, visualizer, tracker, episode + 1) - - if episode < cfg.TOTAL_EPISODES - 1: - print(f"等待 {cfg.EPISODE_INTERVAL} 秒...") - time.sleep(cfg.EPISODE_INTERVAL) - - # 清理 - if traffic_mgr: - traffic_mgr.cleanup() + try: + # 运行episode + for episode in range(cfg.TOTAL_EPISODES): + success = run_episode(env, traffic_mgr, visualizer, tracker, episode + 1) + + if episode < cfg.TOTAL_EPISODES - 1: + print(f"等待 {cfg.EPISODE_INTERVAL} 秒...") + time.sleep(cfg.EPISODE_INTERVAL) + finally: + # 确保清理 + if tracker: + tracker.cleanup() + if traffic_mgr: + traffic_mgr.cleanup() print("\n程序结束") - + if __name__ == '__main__': - main() + main() \ 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 584670f20f..09cb1e70ed 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 @@ -1,6 +1,6 @@ """ -交通管理器 - 简化版 +交通管理器-生成行人和车辆 """ import sys diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/vehicle_tracker.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/vehicle_tracker.py index d76c20a489..667413d7fd 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/vehicle_tracker.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/vehicle_tracker.py @@ -1,11 +1,12 @@ """ -车辆跟踪和视角控制模块 - 平滑跟随车辆,获取车辆状态 +车辆跟踪和视角控制模块 - 从后方跟随车辆(独立更新版本) """ import carla import math import time import numpy as np +import threading import config as cfg class VehicleTracker: @@ -37,73 +38,108 @@ def __init__(self, world): self.velocity_history = [] self.max_velocity_history = 10 - # 视角参数 - self.target_height = cfg.TOP_DOWN_HEIGHT - self.pitch_angle = cfg.TOP_DOWN_PITCH + # 后方跟随参数 + self.follow_distance = 8.0 # 跟随距离(米) + self.follow_height = 3.0 # 跟随高度(米) + self.follow_pitch = -20.0 # 俯视角(度) - print(f"📐 车辆跟踪器初始化完成,平滑系数: {self.smooth_factor}") + # 车辆引用 + self.current_vehicle = None + + # 线程控制 + self.view_update_enabled = cfg.VIEW_UPDATE_ENABLED + self.view_update_fps = cfg.VIEW_UPDATE_FPS + self.view_update_thread = None + self.is_running = False + self.last_frame_time = 0 + + print(f"📐 车辆跟踪器初始化完成,后方跟随模式") + print(f" 跟随距离: {self.follow_distance}m") + print(f" 跟随高度: {self.follow_height}m") + print(f" 俯视角: {self.follow_pitch}°") + print(f" 视角更新FPS: {self.view_update_fps}") - def set_top_down_view(self, vehicle, height=None): - """设置俯视视角""" - if vehicle is None: - return False + def start_view_update_thread(self, vehicle): + """启动独立视角更新线程""" + if not self.view_update_enabled: + return - try: - if height is not None: - self.target_height = height - - transform = vehicle.get_transform() - location = transform.location - - # 设置相机在车辆正上方 - camera_location = carla.Location( - x=location.x, - y=location.y, - z=location.z + self.target_height - ) - - # 设置俯视角度 - camera_rotation = carla.Rotation( - pitch=self.pitch_angle, - yaw=transform.rotation.yaw, - roll=0.0 - ) - - camera_transform = carla.Transform(camera_location, camera_rotation) - self.spectator.set_transform(camera_transform) - self.last_camera_transform = camera_transform - self.last_vehicle_transform = transform - - print(f"📐 设置俯视视角,高度: {self.target_height}m") - return True - - except Exception as e: - print(f"❌ 设置俯视视角失败: {e}") - return False + self.current_vehicle = vehicle + + if self.view_update_thread and self.is_running: + self.stop_view_update_thread() + + self.is_running = True + self.view_update_thread = threading.Thread( + target=self._view_update_loop, + daemon=True + ) + self.view_update_thread.start() + print(f"🔧 启动独立视角更新线程,频率: {self.view_update_fps}Hz") - def smooth_follow_vehicle(self, vehicle, height=None): - """平滑跟随车辆(每帧调用)- 改进版本""" - if vehicle is None: - return False + def stop_view_update_thread(self): + """停止视角更新线程""" + if self.view_update_thread: + self.is_running = False + self.view_update_thread.join(timeout=1.0) + self.view_update_thread = None + print("🛑 停止视角更新线程") + + def _view_update_loop(self): + """独立视角更新循环""" + target_interval = 1.0 / self.view_update_fps + + while self.is_running and self.current_vehicle: + try: + start_time = time.time() + + # 检查是否有足够的车辆信息 + if not self.current_vehicle: + time.sleep(target_interval) + continue + + # 更新视角 + self._update_camera_view() + + # 计算实际耗时并补偿 + elapsed = time.time() - start_time + sleep_time = max(0, target_interval - elapsed) + + if sleep_time > 0: + time.sleep(sleep_time) + else: + # 如果处理时间超过目标间隔,跳过等待 + if cfg.DEBUG_MODE and self.frame_count % 100 == 0: + print(f"[视角] 帧率下降: {elapsed:.3f}s > {target_interval:.3f}s") + + except Exception as e: + if cfg.DEBUG_MODE: + print(f"⚠️ 视角更新线程异常: {e}") + time.sleep(target_interval) + + def _update_camera_view(self): + """更新相机视角(线程安全)""" + if not self.current_vehicle: + return try: current_time = time.time() time_delta = current_time - self.last_update_time - # 限制最小时间间隔,避免计算过于频繁 + # 限制最小时间间隔 if time_delta < 0.001: - return True + return self.last_update_time = current_time self.frame_count += 1 # 获取车辆当前状态 - vehicle_transform = vehicle.get_transform() + vehicle_transform = self.current_vehicle.get_transform() vehicle_location = vehicle_transform.location vehicle_rotation = vehicle_transform.rotation # 获取车辆速度用于预测 - vehicle_velocity = vehicle.get_velocity() + vehicle_velocity = self.current_vehicle.get_velocity() speed = math.sqrt(vehicle_velocity.x**2 + vehicle_velocity.y**2 + vehicle_velocity.z**2) # 更新速度历史 @@ -111,19 +147,22 @@ def smooth_follow_vehicle(self, vehicle, height=None): if len(self.velocity_history) > self.max_velocity_history: self.velocity_history.pop(0) - if height is not None: - self.target_height = height + # 计算车辆的后方偏移方向 + yaw_rad = math.radians(vehicle_rotation.yaw) + + # 计算目标相机位置(车辆后方) + offset_x = -self.follow_distance * math.cos(yaw_rad) + offset_y = -self.follow_distance * math.sin(yaw_rad) - # 计算目标相机位置(车辆正上方) target_location = carla.Location( - x=vehicle_location.x, - y=vehicle_location.y, - z=vehicle_location.z + self.target_height + x=vehicle_location.x + offset_x, + y=vehicle_location.y + offset_y, + z=vehicle_location.z + self.follow_height ) - # 目标相机旋转(保持俯视,yaw跟随车辆) + # 目标相机旋转(朝向车辆) target_rotation = carla.Rotation( - pitch=self.pitch_angle, + pitch=self.follow_pitch, yaw=vehicle_rotation.yaw, roll=0.0 ) @@ -136,7 +175,7 @@ def smooth_follow_vehicle(self, vehicle, height=None): # 预测目标位置(如果启用) if self.prediction_enabled and len(self.velocity_history) > 1: avg_speed = np.mean(self.velocity_history[-3:]) if len(self.velocity_history) >= 3 else speed - target_location = self._predict_target_position( + target_location = self._predict_follow_position( target_location, vehicle_rotation, avg_speed, time_delta ) @@ -174,20 +213,86 @@ def smooth_follow_vehicle(self, vehicle, height=None): self.last_camera_transform = smooth_transform self.last_vehicle_transform = vehicle_transform - # 每100帧输出一次调试信息 - if cfg.DEBUG_MODE and self.frame_count % 100 == 0: + # 调试信息 + if cfg.DEBUG_MODE and self.frame_count % 200 == 0: print(f"[视角] 帧: {self.frame_count}, " f"平滑系数: {effective_smooth_factor:.3f}, " - f"速度: {speed:.2f}m/s, " - f"时差: {time_delta:.3f}s") - - return True + f"速度: {speed:.2f}m/s") except Exception as e: if cfg.DEBUG_MODE: print(f"⚠️ 视角更新失败: {e}") + + def set_follow_view(self, vehicle): + """设置后方跟随视角""" + if vehicle is None: + return False + + try: + transform = vehicle.get_transform() + location = transform.location + rotation = transform.rotation + + # 计算车辆的后方偏移方向 + yaw_rad = math.radians(rotation.yaw) + + # 计算相机位置(车辆后方) + offset_x = -self.follow_distance * math.cos(yaw_rad) + offset_y = -self.follow_distance * math.sin(yaw_rad) + + camera_location = carla.Location( + x=location.x + offset_x, + y=location.y + offset_y, + z=location.z + self.follow_height + ) + + # 相机朝向车辆 + camera_rotation = carla.Rotation( + pitch=self.follow_pitch, + yaw=rotation.yaw, + roll=0.0 + ) + + camera_transform = carla.Transform(camera_location, camera_rotation) + self.spectator.set_transform(camera_transform) + self.last_camera_transform = camera_transform + self.last_vehicle_transform = transform + + # 设置当前车辆并启动更新线程 + self.current_vehicle = vehicle + if cfg.VIEW_UPDATE_THREADED: + self.start_view_update_thread(vehicle) + + print(f"📐 设置后方跟随视角") + return True + + except Exception as e: + print(f"❌ 设置后方跟随视角失败: {e}") return False + def _predict_follow_position(self, target_loc, vehicle_rot, speed, time_delta): + """预测后方跟随位置""" + if speed < 0.1: # 速度太慢不预测 + return target_loc + + # 预测未来0.3秒的位置 + prediction_time = 0.3 + angle_rad = math.radians(vehicle_rot.yaw) + + # 车辆前进方向 + vehicle_dx = speed * math.cos(angle_rad) * prediction_time + vehicle_dy = speed * math.sin(angle_rad) * prediction_time + + # 相机跟随车辆移动 + predicted_x = target_loc.x + vehicle_dx + predicted_y = target_loc.y + vehicle_dy + + return carla.Location( + x=predicted_x, + y=predicted_y, + z=target_loc.z + ) + def _calculate_adaptive_smooth_factor(self, vehicle_loc, target_loc, speed, time_delta): """计算自适应平滑系数""" base_factor = self.smooth_factor @@ -226,24 +331,6 @@ def _calculate_adaptive_smooth_factor(self, vehicle_loc, target_loc, speed, time return base_factor - def _predict_target_position(self, target_loc, vehicle_rot, speed, time_delta): - """预测目标位置""" - if speed < 0.1: # 速度太慢不预测 - return target_loc - - # 预测未来0.2秒的位置 - prediction_time = 0.2 - angle_rad = math.radians(vehicle_rot.yaw) - - predicted_x = target_loc.x + speed * math.cos(angle_rad) * prediction_time - predicted_y = target_loc.y + speed * math.sin(angle_rad) * prediction_time - - return carla.Location( - x=predicted_x, - y=predicted_y, - z=target_loc.z - ) - def _multi_step_interpolation(self, current_transform, target_loc, target_rot, smooth_factor): """多步插值,实现更平滑的移动""" current_loc = current_transform.location @@ -385,6 +472,17 @@ def calculate_progress(self, x, y, route_points): return f"进度: {progress:.1f}% | 距起点: {dist_to_start:.1f}m | 距终点: {dist_to_end:.1f}m" + def update_follow_params(self, distance=None, height=None, pitch=None): + """更新后方跟随参数""" + if distance is not None and distance > 0: + self.follow_distance = distance + if height is not None: + self.follow_height = height + if pitch is not None: + self.follow_pitch = pitch + + print(f"🔄 后方跟随参数更新 - 距离: {self.follow_distance}m, 高度: {self.follow_height}m, 俯角: {self.follow_pitch}°") + def update_smooth_factor(self, factor): """更新平滑系数""" if 0 < factor <= 1: @@ -393,9 +491,14 @@ def update_smooth_factor(self, factor): else: print(f"❌ 无效的平滑系数: {factor},保持为: {self.smooth_factor}") + def cleanup(self): + """清理资源""" + self.stop_view_update_thread() + self.current_vehicle = None + def reset(self): """重置跟踪器状态""" self.velocity_history = [] self.frame_count = 0 self.last_update_time = time.time() - print("🔄 车辆跟踪器已重置") + print("🔄 车辆跟踪器已重置") \ No newline at end of file From 856e574848db23c84d47a1e5875f9180daabf5ac Mon Sep 17 00:00:00 2001 From: yume <3545945359@qq.com> Date: Fri, 19 Dec 2025 13:08:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=8F=AF?= =?UTF-8?q?=E8=B0=83=E5=8F=82=E6=95=B0=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=94=B9?= =?UTF-8?q?=E5=8F=98=E8=B7=AF=E5=BE=84=E6=98=BE=E7=A4=BA=E7=9A=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=92=8C=E4=BA=AE=E5=BA=A6=EF=BC=8C=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E2=80=9C=E5=85=89=E6=B1=A1=E6=9F=93=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/config.py | 32 ++++- .../main/route_visualizer.py | 125 ++++++++++++------ 2 files changed, 113 insertions(+), 44 deletions(-) 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 31b4533265..c2bae517cb 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 @@ -58,14 +58,38 @@ def get_current_trajectory(): TRAFFIC_RESPAWN = False # 是否重生休眠车辆 # ==================== 可视化配置 ==================== -ROUTE_COLOR = (255, 0, 0) # 路线颜色 (红色) -PATH_COLOR = (0, 100, 255) # 路径颜色 (蓝色) -VEHICLE_COLOR = (0, 0, 0) # 车辆颜色 (绿色) +SHOW_ARROW = True # 是否显示车辆方向箭头 +SHOW_HISTORY_PATH = True # 是否显示历史行驶路线 +SHOW_PLANNED_ROUTE = True # 是否显示规划路线 +SHOW_VEHICLE_MARKER = False # 是否显示车辆标记 +# 箭头设置 +ARROW_LENGTH = 5.0 # 箭头长度(米) +ARROW_THICKNESS = 0.2 # 箭头粗细 +ARROW_COLOR = (0, 255, 0) # 箭头颜色(绿色) +ARROW_BRIGHTNESS = 1.0 # 箭头亮度 (0.0-1.0) + +# 历史路线设置 +HISTORY_PATH_COLOR = (0, 100, 255) # 历史路线颜色(蓝色) +HISTORY_PATH_THICKNESS = 0.1 # 历史路线粗细 +HISTORY_PATH_MAX_POINTS = 500 # 历史路线最大点数 +HISTORY_PATH_FADE_OUT = True # 是否渐隐效果 +HISTORY_PATH_BRIGHTNESS = 0.8 # 历史路线亮度 (0.0-1.0) + +# 规划路线设置 +PLANNED_ROUTE_COLOR = (255, 0, 0) # 规划路线颜色(红色) +PLANNED_ROUTE_THICKNESS = 0.15 # 规划路线粗细 +PLANNED_ROUTE_BRIGHTNESS = 1.0 # 规划路线亮度 (0.0-1.0) + +# 车辆标记设置 +VEHICLE_MARKER_COLOR = (0, 255, 0) # 车辆标记颜色(绿色) +VEHICLE_MARKER_SIZE = 0.4 # 车辆标记大小 +VEHICLE_MARKER_BRIGHTNESS = 1.0 # 车辆标记亮度 (0.0-1.0) + +# 显示高度(保持不变) ROUTE_HEIGHT = 0.3 # 路线显示高度 PATH_HEIGHT = 0.2 # 路径显示高度 VEHICLE_HEIGHT = 0.25 # 车辆显示高度 - # ==================== 视角配置 ==================== TOP_DOWN_HEIGHT = 5.0 # 俯视视角高度(提高) TOP_DOWN_PITCH = -30.0 # 俯视角 (几乎垂直向下,-90是完全垂直) diff --git a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/route_visualizer.py b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/route_visualizer.py index d2dd0ff3fb..53acf3be4b 100644 --- a/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/route_visualizer.py +++ b/src/Autonomous_vehicle_navigation_using_deep_learning_master/main/route_visualizer.py @@ -5,6 +5,7 @@ import carla import math import time +import config as cfg class RouteVisualizer: """路线可视化器""" @@ -13,15 +14,32 @@ def __init__(self, world): self.world = world self.vehicle_history = [] # 存储车辆历史位置 - # 颜色定义 - self.route_color = carla.Color(255, 0, 0) # 红色 - 规划路线 - self.path_color = carla.Color(0, 100, 255) # 蓝色 - 历史路径 - self.vehicle_color = carla.Color(0, 255, 0) # 绿色 - 车辆 + # 使用配置文件中的颜色定义 + self.route_color = carla.Color( + int(cfg.PLANNED_ROUTE_COLOR[0] * cfg.PLANNED_ROUTE_BRIGHTNESS), + int(cfg.PLANNED_ROUTE_COLOR[1] * cfg.PLANNED_ROUTE_BRIGHTNESS), + int(cfg.PLANNED_ROUTE_COLOR[2] * cfg.PLANNED_ROUTE_BRIGHTNESS) + ) + self.path_color = carla.Color( + int(cfg.HISTORY_PATH_COLOR[0] * cfg.HISTORY_PATH_BRIGHTNESS), + int(cfg.HISTORY_PATH_COLOR[1] * cfg.HISTORY_PATH_BRIGHTNESS), + int(cfg.HISTORY_PATH_COLOR[2] * cfg.HISTORY_PATH_BRIGHTNESS) + ) + self.vehicle_color = carla.Color( + int(cfg.VEHICLE_MARKER_COLOR[0] * cfg.VEHICLE_MARKER_BRIGHTNESS), + int(cfg.VEHICLE_MARKER_COLOR[1] * cfg.VEHICLE_MARKER_BRIGHTNESS), + int(cfg.VEHICLE_MARKER_COLOR[2] * cfg.VEHICLE_MARKER_BRIGHTNESS) + ) + self.arrow_color = carla.Color( + int(cfg.ARROW_COLOR[0] * cfg.ARROW_BRIGHTNESS), + int(cfg.ARROW_COLOR[1] * cfg.ARROW_BRIGHTNESS), + int(cfg.ARROW_COLOR[2] * cfg.ARROW_BRIGHTNESS) + ) # 显示高度 - self.route_height = 0.3 # 路线显示高度 - self.path_height = 0.2 # 路径显示高度 - self.vehicle_height = 0.25 # 车辆显示高度 + self.route_height = cfg.ROUTE_HEIGHT + self.path_height = cfg.PATH_HEIGHT + self.vehicle_height = cfg.VEHICLE_HEIGHT # 存储绘制对象 self.route_lines = [] @@ -30,6 +48,9 @@ def __init__(self, world): def draw_planned_route(self, route_points): """绘制规划路线(常亮显示)""" + if not cfg.SHOW_PLANNED_ROUTE: + return False + # 清除之前的路线 self.clear_route() @@ -46,7 +67,7 @@ def draw_planned_route(self, route_points): # 绘制线段,使用长生命时间保证常亮 line = self.world.debug.draw_line( start, end, - thickness=0.15, + thickness=cfg.PLANNED_ROUTE_THICKNESS, color=self.route_color, life_time=1000.0, persistent_lines=True @@ -110,15 +131,17 @@ def update_vehicle_display(self, x, y, heading): # 保存历史位置 self.vehicle_history.append((x, y, heading, time.time())) - # 保持最近500个历史点 - if len(self.vehicle_history) > 500: - self.vehicle_history = self.vehicle_history[-500:] + # 保持历史点数量 + if len(self.vehicle_history) > cfg.HISTORY_PATH_MAX_POINTS: + self.vehicle_history = self.vehicle_history[-cfg.HISTORY_PATH_MAX_POINTS:] # 绘制车辆当前位置和朝向 - self._draw_vehicle_current(x, y, heading) + if cfg.SHOW_VEHICLE_MARKER: + self._draw_vehicle_current(x, y, heading) # 绘制历史路径 - self._draw_vehicle_history() + if cfg.SHOW_HISTORY_PATH: + self._draw_vehicle_history() # 更新信息显示 self._update_info_display(x, y, heading) @@ -130,27 +153,28 @@ def _draw_vehicle_current(self, x, y, heading): self.world.debug.draw_point( vehicle_loc, - size=0.4, + size=cfg.VEHICLE_MARKER_SIZE, color=self.vehicle_color, life_time=0.5, # 稍微延长显示时间 persistent_lines=False ) # 车辆朝向箭头 - arrow_length = 2.5 - angle_rad = math.radians(heading) - end_x = x + arrow_length * math.cos(angle_rad) - end_y = y + arrow_length * math.sin(angle_rad) - - self.world.debug.draw_arrow( - vehicle_loc, - self._create_location((end_x, end_y, 0), self.vehicle_height), - thickness=0.2, - arrow_size=0.6, - color=self.vehicle_color, - life_time=0.5, - persistent_lines=False - ) + if cfg.SHOW_ARROW: + arrow_length = cfg.ARROW_LENGTH + angle_rad = math.radians(heading) + end_x = x + arrow_length * math.cos(angle_rad) + end_y = y + arrow_length * math.sin(angle_rad) + + self.world.debug.draw_arrow( + vehicle_loc, + self._create_location((end_x, end_y, 0), self.vehicle_height), + thickness=cfg.ARROW_THICKNESS, + arrow_size=0.6, + color=self.arrow_color, + life_time=0.5, + persistent_lines=False + ) # 车辆轮廓(三角形) self._draw_vehicle_outline(x, y, heading) @@ -194,8 +218,11 @@ def _draw_vehicle_history(self): if len(self.vehicle_history) < 2: return - # 绘制最近100个点的路径 - start_idx = max(0, len(self.vehicle_history) - 100) + # 确定要绘制的点范围 + if cfg.HISTORY_PATH_MAX_POINTS > 0: + start_idx = max(0, len(self.vehicle_history) - cfg.HISTORY_PATH_MAX_POINTS) + else: + start_idx = 0 for i in range(start_idx, len(self.vehicle_history) - 1): x1, y1, _, t1 = self.vehicle_history[i] @@ -205,21 +232,29 @@ def _draw_vehicle_history(self): end = self._create_location((x2, y2, 0), self.path_height) # 根据时间远近调整透明度 - time_diff = t2 - t1 - if time_diff > 0: - alpha = min(1.0, 1.0 / (1.0 + (len(self.vehicle_history) - i) * 0.1)) + if cfg.HISTORY_PATH_FADE_OUT: + time_diff = t2 - t1 + if time_diff > 0: + # 计算衰减因子:越新的点越亮 + age = len(self.vehicle_history) - i - 1 + alpha = max(0.1, 1.0 / (1.0 + age * 0.05)) + else: + alpha = 0.5 else: - alpha = 0.5 + alpha = 1.0 + # 应用亮度配置 + brightness_factor = cfg.HISTORY_PATH_BRIGHTNESS * alpha + color = carla.Color( - int(self.path_color.r * alpha), - int(self.path_color.g * alpha), - int(self.path_color.b * alpha) + int(self.path_color.r * brightness_factor), + int(self.path_color.g * brightness_factor), + int(self.path_color.b * brightness_factor) ) self.world.debug.draw_line( start, end, - thickness=0.1, + thickness=cfg.HISTORY_PATH_THICKNESS, color=color, life_time=0.5, persistent_lines=False @@ -253,7 +288,7 @@ def _update_info_display(self, x, y, heading): ) # 显示历史点数 - history_text = f"History Points: {len(self.vehicle_history)}" + history_text = f"History Points: {len(self.vehicle_history)}/{cfg.HISTORY_PATH_MAX_POINTS}" self.world.debug.draw_string( carla.Location(-30, 1, info_height), history_text, @@ -261,6 +296,16 @@ def _update_info_display(self, x, y, heading): color=carla.Color(255, 200, 200), life_time=0.3 ) + + # 显示可视化状态 + viz_status = f"Viz: Arrow={cfg.SHOW_ARROW}, History={cfg.SHOW_HISTORY_PATH}, Route={cfg.SHOW_PLANNED_ROUTE}" + self.world.debug.draw_string( + carla.Location(-30, 0, info_height), + viz_status, + draw_shadow=True, + color=carla.Color(200, 255, 200), + life_time=0.3 + ) def calculate_path_length(self): """计算已行驶路径长度""" @@ -298,4 +343,4 @@ def _create_location(self, point, z_offset=0): def get_vehicle_history(self): """获取车辆历史记录""" - return self.vehicle_history + return self.vehicle_history \ No newline at end of file