|
@@ -2376,6 +2376,14 @@ else
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if(ServiceCarStatus.msysparam.mvehtype=="shenlan")
|
|
|
+ {
|
|
|
+ if(dSpeed>10.0)
|
|
|
+ {
|
|
|
+ dSpeed=10.0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
phaseSpeedDecition(gps_decition, secSpeed, obsDistance, obsSpeed,now_gps_ins);
|
|
|
|
|
|
Point2D now_s_d=iv::decition::cartesian_to_frenet1D(gpsMapLine,now_gps_ins.gps_x,now_gps_ins.gps_y);
|
|
@@ -4148,7 +4156,7 @@ float iv::decition::DecideGps00::ComputeTrafficLightSpeed(int traffic_light_col
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- minDecelerate=-0.7;
|
|
|
+ //minDecelerate=-0.7;
|
|
|
traffic_speed=0;
|
|
|
}
|
|
|
return traffic_speed;
|