Преглед на файлове

change decition_brain_sf_Jeely_xingyueL.

yuchuli преди 2 години
родител
ревизия
cb52ba68c1
променени са 1 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 6 3
      src/decition/decition_brain_sf_Jeely_xingyueL/decition/groupspeedctrl.cpp

+ 6 - 3
src/decition/decition_brain_sf_Jeely_xingyueL/decition/groupspeedctrl.cpp

@@ -226,13 +226,16 @@ double GroupSpeedCtrl::Getmindec_front(iv::group::groupinfo & xgroupinfo,
 
     double fspeeddiff = fsecspeednow - pvehbefore->mgpsimu().speed();
 
-    if(fspeeddiff > 0.1)
+    if(fspeeddiff > 0)
     {
         if(((fspeeddiff*fspeeddiff/(2*1.0))+fVehMinDis) < fdistocur)
         {
 //            assert((fdistocur-fVehMinDis)>0);
-            double fdec = (-1.0) * fspeeddiff*fspeeddiff/(2*(fdistocur - fVehMinDis));
-            return fdec;
+            if((fdistocur - fVehMinDis)>0.001)
+            {
+                double fdec = (-1.0) * fspeeddiff*fspeeddiff/(2*(fdistocur - fVehMinDis));
+                return fdec;
+            }
         }
     }
     else