|
|
@@ -1996,7 +1996,7 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
|
{
|
|
|
if((distance_to_center>=radiation_distance)&&(distance_to_center<=radiation_distance+10))
|
|
|
{
|
|
|
- dSpeed = min(1,realspeed-0.5);
|
|
|
+ dSpeed = min(1.0,realspeed-0.5);
|
|
|
}
|
|
|
else if(distance_to_center<radiation_distance)
|
|
|
{
|
|
|
@@ -2010,13 +2010,13 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
|
{
|
|
|
if(distance_to_center<radiation_distance)
|
|
|
{
|
|
|
- dSpeed=min(limit_spd,realspeed-0.5);
|
|
|
+ dSpeed=min((double)limit_spd,realspeed-0.5);
|
|
|
}
|
|
|
}
|
|
|
//碰撞预警,1减速,2 停车
|
|
|
if(warning_type==0x01)
|
|
|
{
|
|
|
- dSpeed=limit_spd;
|
|
|
+ dSpeed=limit_spd;//此处要判断限速值是不是在有效值范围以内
|
|
|
}
|
|
|
else if(warning_type==0x01)
|
|
|
{
|