|
@@ -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
|