fly/flightgear
1
0
Fork 0
Code Activity

Fix a problem in AITraffic where waypoint iterator is trashed by push_back. A cleaner solution would be to use indices instead of iterators to track position in the waypoint vector

Browse source
This commit is contained in:
Frederic Bouvier 2011-10-22 10:15:16 +02:00
parent 90b67e5fd5
commit 3a262fe7d3
3 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/AIModel/AIFlightPlan.cxx
View file

@ -127,7 +127,7 @@ FGAIFlightPlan::FGAIFlightPlan(const string& filename)
if (wpt->getName() == "END") wpt->setFinished(true); if (wpt->getName() == "END") wpt->setFinished(true);
else wpt->setFinished(false); else wpt->setFinished(false);
waypoints.push_back( wpt ); pushBackWaypoint( wpt );
} }
wpt_iterator = waypoints.begin(); wpt_iterator = waypoints.begin();
@ -192,7 +192,7 @@ FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac,
SGPropertyNode * node = root.getNode("flightplan"); SGPropertyNode * node = root.getNode("flightplan");
//waypoints.push_back( init_waypoint ); //pushBackWaypoint( init_waypoint );
for (int i = 0; i < node->nChildren(); i++) { for (int i = 0; i < node->nChildren(); i++) {
//cout << "Reading waypoint " << i << endl; //cout << "Reading waypoint " << i << endl;
FGAIWaypoint* wpt = new FGAIWaypoint; FGAIWaypoint* wpt = new FGAIWaypoint;
@ -208,7 +208,7 @@ FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac,
if (wpt->getName() == "END") wpt->setFinished(true); if (wpt->getName() == "END") wpt->setFinished(true);
else wpt->setFinished(false); else wpt->setFinished(false);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} // of node loop } // of node loop
wpt_iterator = waypoints.begin(); wpt_iterator = waypoints.begin();
} catch (const sg_exception &e) { } catch (const sg_exception &e) {
@ -305,7 +305,7 @@ FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac,
{ {
if ((dist > 100.0) && (useInitialWayPoint)) if ((dist > 100.0) && (useInitialWayPoint))
{ {
//waypoints.push_back(init_waypoint);; //pushBackWaypoint(init_waypoint);;
waypoints.insert(i, init_waypoint); waypoints.insert(i, init_waypoint);
//cerr << "Using waypoint : " << init_waypoint->name << endl; //cerr << "Using waypoint : " << init_waypoint->name << endl;
} }
@ -313,7 +313,7 @@ FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac,
// { // {
// (*i)->speed = dist; // A hack // (*i)->speed = dist; // A hack
// } // }
//waypoints.push_back( wpt ); //pushBackWaypoint( wpt );
//cerr << "Using waypoint : " << (*i)->name //cerr << "Using waypoint : " << (*i)->name
// << ": course diff : " << crsDiff // << ": course diff : " << crsDiff
// << "Course = " << course // << "Course = " << course
@ -513,10 +513,20 @@ void FGAIFlightPlan::resetWaypoints()
wpt->setOn_ground ( (*i)->getOn_ground() ); wpt->setOn_ground ( (*i)->getOn_ground() );
//cerr << "Recycling waypoint " << wpt->name << endl; //cerr << "Recycling waypoint " << wpt->name << endl;
deleteWaypoints(); deleteWaypoints();
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
} }
void FGAIFlightPlan::pushBackWaypoint(FGAIWaypoint *wpt)
{
// std::vector::push_back invalidates waypoints
// so we should restore wpt_iterator after push_back
// (or it could be an index in the vector)
size_t pos = wpt_iterator - waypoints.begin();
waypoints.push_back(wpt);
wpt_iterator = waypoints.begin() + pos;
}
// Start flightplan over from the beginning // Start flightplan over from the beginning
void FGAIFlightPlan::restart() void FGAIFlightPlan::restart()
{ {

1
src/AIModel/AIFlightPlan.hxx
View file

@ -198,6 +198,7 @@ private:
void deleteWaypoints(); void deleteWaypoints();
void resetWaypoints(); void resetWaypoints();
void eraseLastWaypoint(); void eraseLastWaypoint();
void pushBackWaypoint(FGAIWaypoint *wpt);
bool createLandingTaxi(FGAIAircraft *, FGAirport *apt, double radius, const std::string& fltType, const std::string& acType, const std::string& airline); bool createLandingTaxi(FGAIAircraft *, FGAirport *apt, double radius, const std::string& fltType, const std::string& acType, const std::string& airline);
void createDefaultLandingTaxi(FGAIAircraft *, FGAirport* aAirport); void createDefaultLandingTaxi(FGAIAircraft *, FGAirport* aAirport);

52
src/AIModel/AIFlightPlanCreate.cxx
View file

@ -191,11 +191,11 @@ void FGAIFlightPlan::createDefaultTakeoffTaxi(FGAIAircraft * ac,
wpt = wpt =
createOnGround(ac, "Airport Center", aAirport->geod(), airportElev, createOnGround(ac, "Airport Center", aAirport->geod(), airportElev,
ac->getPerformance()->vTaxi()); ac->getPerformance()->vTaxi());
waypoints.push_back(wpt); pushBackWaypoint(wpt);
wpt = wpt =
createOnGround(ac, "Runway Takeoff", runwayTakeoff, airportElev, createOnGround(ac, "Runway Takeoff", runwayTakeoff, airportElev,
ac->getPerformance()->vTaxi()); ac->getPerformance()->vTaxi());
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
bool FGAIFlightPlan::createTakeoffTaxi(FGAIAircraft * ac, bool firstFlight, bool FGAIFlightPlan::createTakeoffTaxi(FGAIAircraft * ac, bool firstFlight,
@ -325,12 +325,12 @@ bool FGAIFlightPlan::createTakeoffTaxi(FGAIAircraft * ac, bool firstFlight,
if (taxiRoute->nodesLeft() == 0) { if (taxiRoute->nodesLeft() == 0) {
wpt->setName(wpt->getName() + string("Accel")); wpt->setName(wpt->getName() + string("Accel"));
} }
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
// Acceleration point, 105 meters into the runway, // Acceleration point, 105 meters into the runway,
SGGeod accelPoint = rwy->pointOnCenterline(105.0); SGGeod accelPoint = rwy->pointOnCenterline(105.0);
FGAIWaypoint *wpt = createOnGround(ac, "accel", accelPoint, apt->getElevation(), ac->getPerformance()->vRotate()); FGAIWaypoint *wpt = createOnGround(ac, "accel", accelPoint, apt->getElevation(), ac->getPerformance()->vRotate());
waypoints.push_back(wpt); pushBackWaypoint(wpt);
//cerr << "[done]" << endl; //cerr << "[done]" << endl;
return true; return true;
@ -348,18 +348,18 @@ void FGAIFlightPlan::createDefaultLandingTaxi(FGAIAircraft * ac,
wpt = wpt =
createOnGround(ac, "Runway Exit", lastWptPos, airportElev, createOnGround(ac, "Runway Exit", lastWptPos, airportElev,
ac->getPerformance()->vTaxi()); ac->getPerformance()->vTaxi());
waypoints.push_back(wpt); pushBackWaypoint(wpt);
wpt = wpt =
createOnGround(ac, "Airport Center", aAirport->geod(), airportElev, createOnGround(ac, "Airport Center", aAirport->geod(), airportElev,
ac->getPerformance()->vTaxi()); ac->getPerformance()->vTaxi());
waypoints.push_back(wpt); pushBackWaypoint(wpt);
double heading, lat, lon; double heading, lat, lon;
aAirport->getDynamics()->getParking(gateId, &lat, &lon, &heading); aAirport->getDynamics()->getParking(gateId, &lat, &lon, &heading);
wpt = wpt =
createOnGround(ac, "END", SGGeod::fromDeg(lon, lat), airportElev, createOnGround(ac, "END", SGGeod::fromDeg(lon, lat), airportElev,
ac->getPerformance()->vTaxi()); ac->getPerformance()->vTaxi());
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
bool FGAIFlightPlan::createLandingTaxi(FGAIAircraft * ac, FGAirport * apt, bool FGAIFlightPlan::createLandingTaxi(FGAIAircraft * ac, FGAirport * apt,
@ -424,7 +424,7 @@ bool FGAIFlightPlan::createLandingTaxi(FGAIAircraft * ac, FGAirport * apt,
createOnGround(ac, buffer, tn->getGeod(), apt->getElevation(), createOnGround(ac, buffer, tn->getGeod(), apt->getElevation(),
ac->getPerformance()->vTaxi()); ac->getPerformance()->vTaxi());
wpt->setRouteIndex(route); wpt->setRouteIndex(route);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
return true; return true;
} }
@ -489,7 +489,7 @@ bool FGAIFlightPlan::createTakeOff(FGAIAircraft * ac, bool firstFlight,
//cerr << "Using " << accelDistance << " " << accelMetric << " " << vTakeoffMetric << endl; //cerr << "Using " << accelDistance << " " << accelMetric << " " << vTakeoffMetric << endl;
SGGeod accelPoint = rwy->pointOnCenterline(105.0 + accelDistance); SGGeod accelPoint = rwy->pointOnCenterline(105.0 + accelDistance);
wpt = createOnGround(ac, "rotate", accelPoint, airportElev, vTakeoff); wpt = createOnGround(ac, "rotate", accelPoint, airportElev, vTakeoff);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
accelDistance = accelDistance =
((vTakeoffMetric * 1.1) * (vTakeoffMetric * 1.1) - ((vTakeoffMetric * 1.1) * (vTakeoffMetric * 1.1) -
@ -500,18 +500,18 @@ bool FGAIFlightPlan::createTakeOff(FGAIAircraft * ac, bool firstFlight,
createOnGround(ac, "rotate", accelPoint, airportElev + 1000, createOnGround(ac, "rotate", accelPoint, airportElev + 1000,
vTakeoff * 1.1); vTakeoff * 1.1);
wpt->setOn_ground(false); wpt->setOn_ground(false);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
wpt = cloneWithPos(ac, wpt, "3000 ft", rwy->end()); wpt = cloneWithPos(ac, wpt, "3000 ft", rwy->end());
wpt->setAltitude(airportElev + 3000); wpt->setAltitude(airportElev + 3000);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
// Finally, add two more waypoints, so that aircraft will remain under // Finally, add two more waypoints, so that aircraft will remain under
// Tower control until they have reached the 3000 ft climb point // Tower control until they have reached the 3000 ft climb point
SGGeod pt = rwy->pointOnCenterline(5000 + rwy->lengthM() * 0.5); SGGeod pt = rwy->pointOnCenterline(5000 + rwy->lengthM() * 0.5);
wpt = cloneWithPos(ac, wpt, "5000 ft", pt); wpt = cloneWithPos(ac, wpt, "5000 ft", pt);
wpt->setAltitude(airportElev + 5000); wpt->setAltitude(airportElev + 5000);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
return true; return true;
} }
@ -537,7 +537,7 @@ bool FGAIFlightPlan::createClimb(FGAIAircraft * ac, bool firstFlight,
if (sid) { if (sid) {
for (wpt_vector_iterator i = sid->getFirstWayPoint(); for (wpt_vector_iterator i = sid->getFirstWayPoint();
i != sid->getLastWayPoint(); i++) { i != sid->getLastWayPoint(); i++) {
waypoints.push_back(clone(*(i))); pushBackWaypoint(clone(*(i)));
//cerr << " Cloning waypoint " << endl; //cerr << " Cloning waypoint " << endl;
} }
} else { } else {
@ -548,12 +548,12 @@ bool FGAIFlightPlan::createClimb(FGAIAircraft * ac, bool firstFlight,
wpt = createInAir(ac, "10000ft climb", climb1, 10000, vClimb); wpt = createInAir(ac, "10000ft climb", climb1, 10000, vClimb);
wpt->setGear_down(true); wpt->setGear_down(true);
wpt->setFlaps_down(true); wpt->setFlaps_down(true);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
SGGeod climb2 = rwy->pointOnCenterline(20 * SG_NM_TO_METER); SGGeod climb2 = rwy->pointOnCenterline(20 * SG_NM_TO_METER);
wpt = cloneWithPos(ac, wpt, "18000ft climb", climb2); wpt = cloneWithPos(ac, wpt, "18000ft climb", climb2);
wpt->setAltitude(18000); wpt->setAltitude(18000);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
return true; return true;
} }
@ -762,7 +762,7 @@ bool FGAIFlightPlan::createDescent(FGAIAircraft * ac, FGAirport * apt,
wpt = createInAir(ac, buffer, result, currentAltitude, vDescent); wpt = createInAir(ac, buffer, result, currentAltitude, vDescent);
wpt->setCrossat(currentAltitude); wpt->setCrossat(currentAltitude);
wpt->setTrackLength((newDistance / nPoints)); wpt->setTrackLength((newDistance / nPoints));
waypoints.push_back(wpt); pushBackWaypoint(wpt);
//cerr << "Track Length : " << wpt->trackLength; //cerr << "Track Length : " << wpt->trackLength;
//cerr << " Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << endl; //cerr << " Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << endl;
} }
@ -815,7 +815,7 @@ bool FGAIFlightPlan::createDescent(FGAIAircraft * ac, FGAirport * apt,
wpt->setCrossat(currentAltitude); wpt->setCrossat(currentAltitude);
wpt->setTrackLength(trackLength); wpt->setTrackLength(trackLength);
//cerr << "Track Length : " << wpt->trackLength; //cerr << "Track Length : " << wpt->trackLength;
waypoints.push_back(wpt); pushBackWaypoint(wpt);
//cerr << " Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << endl; //cerr << " Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << endl;
} }
@ -844,7 +844,7 @@ bool FGAIFlightPlan::createDescent(FGAIAircraft * ac, FGAirport * apt,
wpt->setTrackLength(wpt->getTrackLength() + distanceCovered); wpt->setTrackLength(wpt->getTrackLength() + distanceCovered);
} }
//cerr << "Track Length : " << wpt->trackLength; //cerr << "Track Length : " << wpt->trackLength;
waypoints.push_back(wpt); pushBackWaypoint(wpt);
//if (apt->ident() == fgGetString("/sim/presets/airport-id")) { //if (apt->ident() == fgGetString("/sim/presets/airport-id")) {
// cerr << " Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << " " << apt->getElevation() << " " << distanceOut << endl; // cerr << " Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << " " << apt->getElevation() << " " << distanceOut << endl;
//} //}
@ -949,7 +949,7 @@ bool FGAIFlightPlan::createLanding(FGAIAircraft * ac, FGAirport * apt,
coord = rwy->pointOnCenterline((rolloutDistance * ((double) i / (double) nPoints))); coord = rwy->pointOnCenterline((rolloutDistance * ((double) i / (double) nPoints)));
wpt = createOnGround(ac, buffer, coord, currElev, 2*vTaxi); wpt = createOnGround(ac, buffer, coord, currElev, 2*vTaxi);
wpt->setCrossat(currElev); wpt->setCrossat(currElev);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
wpt->setSpeed(vTaxi); wpt->setSpeed(vTaxi);
double mindist = 1.1 * rolloutDistance; double mindist = 1.1 * rolloutDistance;
@ -980,7 +980,7 @@ bool FGAIFlightPlan::createLanding(FGAIAircraft * ac, FGAirport * apt,
} }
if (tn) { if (tn) {
wpt = createOnGround(ac, buffer, tn->getGeod(), currElev, vTaxi); wpt = createOnGround(ac, buffer, tn->getGeod(), currElev, vTaxi);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
} }
} }
cerr << "Done. " << endl; cerr << "Done. " << endl;
@ -989,16 +989,16 @@ bool FGAIFlightPlan::createLanding(FGAIAircraft * ac, FGAirport * apt,
//Runway Threshold //Runway Threshold
wpt = createOnGround(ac, "Threshold", rwy->threshold(), aptElev, vTouchdown); wpt = createOnGround(ac, "Threshold", rwy->threshold(), aptElev, vTouchdown);
wpt->crossat = apt->getElevation(); wpt->crossat = apt->getElevation();
waypoints.push_back(wpt); pushBackWaypoint(wpt);
// Roll-out // Roll-out
wpt = createOnGround(ac, "Center", rwy->geod(), aptElev, vTaxi*2); wpt = createOnGround(ac, "Center", rwy->geod(), aptElev, vTaxi*2);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
SGGeod rollOut = rwy->pointOnCenterline(rwy->lengthM() * 0.9); SGGeod rollOut = rwy->pointOnCenterline(rwy->lengthM() * 0.9);
wpt = createOnGround(ac, "Roll Out", rollOut, aptElev, vTaxi); wpt = createOnGround(ac, "Roll Out", rollOut, aptElev, vTaxi);
wpt->crossat = apt->getElevation(); wpt->crossat = apt->getElevation();
waypoints.push_back(wpt); pushBackWaypoint(wpt);
*/ */
return true; return true;
} }
@ -1028,7 +1028,7 @@ bool FGAIFlightPlan::createParking(FGAIAircraft * ac, FGAirport * apt,
wpt = wpt =
createOnGround(ac, "taxiStart", SGGeod::fromDeg(lon2, lat2), createOnGround(ac, "taxiStart", SGGeod::fromDeg(lon2, lat2),
aptElev, vTaxiReduced); aptElev, vTaxiReduced);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
geo_direct_wgs_84(0, lat, lon, heading, geo_direct_wgs_84(0, lat, lon, heading,
0.1 * radius, &lat2, &lon2, &az2); 0.1 * radius, &lat2, &lon2, &az2);
@ -1036,12 +1036,12 @@ bool FGAIFlightPlan::createParking(FGAIAircraft * ac, FGAirport * apt,
wpt = wpt =
createOnGround(ac, "taxiStart2", SGGeod::fromDeg(lon2, lat2), createOnGround(ac, "taxiStart2", SGGeod::fromDeg(lon2, lat2),
aptElev, vTaxiReduced); aptElev, vTaxiReduced);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
wpt = wpt =
createOnGround(ac, "END", SGGeod::fromDeg(lon, lat), aptElev, createOnGround(ac, "END", SGGeod::fromDeg(lon, lat), aptElev,
vTaxiReduced); vTaxiReduced);
waypoints.push_back(wpt); pushBackWaypoint(wpt);
return true; return true;
} }