fly/flightgear
1
0
Fork 0
Code Activity

James Turner: Rewrite of the getSpeed function. Smaller and more elegant.

Browse source
This commit is contained in:
durk 2009-01-04 17:11:25 +00:00 • committed by Tim Moore
parent b0b6a0d998
commit 63d224081e
1 changed files with 8 additions and 32 deletions

40
src/Traffic/Schedule.cxx
View file

@ -37,10 +37,8 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <plib/sg.h>
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/math/polar3d.hxx> #include <simgear/sg_inlines.h>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/route/waypoint.hxx> #include <simgear/route/waypoint.hxx>
@ -577,37 +575,15 @@ FGScheduledFlight* FGAISchedule::findAvailableFlight (const string &currentDesti
double FGAISchedule::getSpeed() double FGAISchedule::getSpeed()
{ {
double courseToDest;
double distanceToDest;
double speed, remainingTimeEnroute;
FGAirport *dep, *arr;
FGScheduledFlightVecIterator i = flights.begin(); FGScheduledFlightVecIterator i = flights.begin();
dep = (*i)->getDepartureAirport();
arr = (*i)->getArrivalAirport ();
if (!(dep && arr))
return 0;
SGWayPoint dest ( dep->getLongitude(), FGAirport* dep = (*i)->getDepartureAirport(),
dep->getLatitude(), *arr = (*i)->getArrivalAirport();
(*i)->getCruiseAlt(), double dist = SGGeodesy::distanceNm(dep->geod(), arr->geod());
SGWayPoint::SPHERICAL); double remainingTimeEnroute = (*i)->getArrivalTime() - (*i)->getDepartureTime();
SGWayPoint curr ( arr->getLongitude(),
arr->getLatitude(), double speed = dist / (remainingTimeEnroute/3600.0);
(*i)->getCruiseAlt(), SG_CLAMP_RANGE(speed, 300.0, 500.0);
SGWayPoint::SPHERICAL);
remainingTimeEnroute = (*i)->getArrivalTime() - (*i)->getDepartureTime();
dest.CourseAndDistance(curr, &courseToDest, &distanceToDest);
speed = (distanceToDest*SG_METER_TO_NM) /
((double) remainingTimeEnroute/3600.0);
if (speed < 300) {
//cerr << "Warning : calculated speed for " << (*i)->getCallSign() << " is low : " << speed << " clamping to 300" << endl;
speed = 300.0;
}
if (speed > 500) {
//cerr << "Warning : calculated speed for " << (*i)->getCallSign() << " is high : " << speed << " clamping to 300" << endl;
speed = 500.0;
}
return speed; return speed;
} }
/* /*