Ver código fonte

change decition_brain use simulator.

yuchuli 1 ano atrás
pai
commit
17ce05eed6

+ 6 - 3
src/decition/decition_brain_sf_changan_shenlan/decition/decide_gps_00.cpp

@@ -1341,8 +1341,11 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
             }
             else
             {
-                gpsTraceNow = getGpsTraceOffset(gpsTraceOri, avoidXNew);
-                getGpsTraceNowLeftRight(gpsTraceNow);
+                gpsTraceNow.assign(gpsTraceOri.begin(), gpsTraceOri.end());
+                gpsTraceNowLeft.assign(traceOriLeft.begin(),traceOriLeft.end());
+                gpsTraceNowRight.assign(traceOriRight.begin(),traceOriRight.end());
+//                gpsTraceNow = getGpsTraceOffset(gpsTraceOri, avoidXNew);
+//                getGpsTraceNowLeftRight(gpsTraceNow);
             }
         }
     }
@@ -1988,7 +1991,7 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
 
     //shiyanbizhang 0929
     if(obsDistance>0&& (obsDistance<ServiceCarStatus.aocfDis)&&(obs_speed_for_avoid>-8.0)&&(obs_speed_for_avoid<3.0)&&(realspeed>0.01)//&& (avoid_speed_flag==true)        //
-            &&(vehState==normalRun||vehState==backOri || vehState==avoiding) //&&(ObsTimeStart==-1)
+        &&(vehState==normalRun||vehState==backOri) //|| vehState==avoiding) //&&(ObsTimeStart==-1)
             && (gpsMapLine[PathPoint]->runMode==1)&& (road_permit_avoid==true)&&(gpsMapLine[PathPoint]->mode2!=3000)){
         //        ObsTimeStart=GetTickCount();
         if((PathPoint + 300)<gpsMapLine.size())