xiansu

src/decition/decition_brain_sf_changan_shenlan/decition/decide_gps_00.cpp

@@ -2300,11 +2300,7 @@ else
         dSpeed = min((double)traffic_speed,dSpeed);
         if(traffic_speed==0)
         {
-<<<<<<< Updated upstream
             minDecelerate=-1.0; //-2.0 ,深蓝车速比较小将减速度改小一些
-=======
-            minDecelerate=-1.0;//-2.0;//刹车太猛，改小一些
->>>>>>> Stashed changes
         }
        // givlog->debug("decition_brain","traffic_light_pathpoint is : %d",traffic_light_pathpoint);
    //        givlog->debug("decition_brain","traffic_speed is : %f",traffic_speed);
@@ -2385,11 +2381,7 @@ else
     {
         if(dSpeed>10.0)
         {
-<<<<<<< Updated upstream
-            dSpeed=10.0;
-=======
             dSpeed=10.0;   //shenlan bisai xiansu 10
->>>>>>> Stashed changes
         }
     }