for (FGScheduledFlightVecIterator i = flt.begin();
i != flt.end();
i++)
- flights.push_back(FGScheduledFlight((*i)));
+ flights.push_back(new FGScheduledFlight((*(*i))));
AIManagerRef = 0;
score = scre;
firstRun = true;
FGAISchedule::~FGAISchedule()
{
-
+ for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++)
+ {
+ delete (*flt);
+ }
+ flights.clear();
}
bool FGAISchedule::init()
i++)
{
//i->adjustTime(now);
- if (!(i->initializeAirports()))
+ if (!((*i)->initializeAirports()))
return false;
}
//sort(flights.begin(), flights.end());
{
FGAirport *dep;
FGAirport *arr;
- sgdVec3 a, b, cross;
- sgdVec3 newPos;
- sgdMat4 matrix;
double angle;
FGAIManager *aimgr;
double distanceToDest;
double speed;
- Point3D temp;
time_t
totalTimeEnroute,
elapsedTimeEnroute,
i != flights.end();
i++)
{
- i->adjustTime(now);
+ (*i)->adjustTime(now);
}
if (fgGetBool("/sim/traffic-manager/instantaneous-action") == true)
- deptime = now;
+ deptime = now + rand() % 300; // Wait up to 5 minutes until traffic starts moving to prevent too many aircraft
+ // from cluttering the gate areas.
firstRun = false;
}
// Sort all the scheduled flights according to scheduled departure time.
// Because this is done at every update, we only need to check the status
// of the first listed flight.
- sort(flights.begin(), flights.end());
+ sort(flights.begin(), flights.end(), compareScheduledFlights);
if (!deptime)
- deptime = flights.begin()->getDepartureTime();
+ deptime = (*flights.begin())->getDepartureTime();
FGScheduledFlightVecIterator i = flights.begin();
+ SG_LOG (SG_GENERAL, SG_DEBUG,"Processing registration " << registration << " with callsign " << (*i)->getCallSign());
if (AIManagerRef)
{
// Check if this aircraft has been released.
//cerr << "Estimated minimum distance to user: " << distanceToUser << endl;
// This flight entry is entirely in the past, do we need to
// push it forward in time to the next scheduled departure.
- if ((i->getDepartureTime() < now) && (i->getArrivalTime() < now))
+ if (((*i)->getDepartureTime() < now) && ((*i)->getArrivalTime() < now))
{
- i->update();
+ (*i)->update();
return true;
}
// object for it.
//if ((i->getDepartureTime() < now) && (i->getArrivalTime() > now))
-
// Part of this flight is in the future.
- if (i->getArrivalTime() > now)
+ if ((*i)->getArrivalTime() > now)
{
- dep = i->getDepartureAirport();
- arr = i->getArrivalAirport ();
+ dep = (*i)->getDepartureAirport();
+ arr = (*i)->getArrivalAirport ();
if (!(dep && arr))
return false;
- temp = sgPolarToCart3d(Point3D(dep->getLongitude() *
- SG_DEGREES_TO_RADIANS,
- dep->getLatitude() *
- SG_DEGREES_TO_RADIANS,
- 1.0));
- a[0] = temp.x();
- a[1] = temp.y();
- a[2] = temp.z();
+ SGVec3d a = SGVec3d::fromGeoc(SGGeoc::fromDegM(dep->getLongitude(),
+ dep->getLatitude(), 1));
+ SGVec3d b = SGVec3d::fromGeoc(SGGeoc::fromDegM(arr->getLongitude(),
+ arr->getLatitude(), 1));
+ SGVec3d _cross = cross(b, a);
- temp = sgPolarToCart3d(Point3D(arr->getLongitude() *
- SG_DEGREES_TO_RADIANS,
- arr->getLatitude() *
- SG_DEGREES_TO_RADIANS,
- 1.0));
- b[0] = temp.x();
- b[1] = temp.y();
- b[2] = temp.z();
- sgdNormaliseVec3(a);
- sgdNormaliseVec3(b);
- sgdVectorProductVec3(cross,b,a);
-
- angle = sgACos(sgdScalarProductVec3(a,b));
+ angle = sgACos(dot(a, b));
// Okay, at this point we have the angle between departure and
// arrival airport, in degrees. From here we can interpolate the
// position of the aircraft by calculating the ratio between
// total time enroute and elapsed time enroute.
- totalTimeEnroute = i->getArrivalTime() - i->getDepartureTime();
- if (now > i->getDepartureTime())
+ totalTimeEnroute = (*i)->getArrivalTime() - (*i)->getDepartureTime();
+ if (now > (*i)->getDepartureTime())
{
//err << "Lat = " << lat << ", lon = " << lon << endl;
//cerr << "Time diff: " << now-i->getDepartureTime() << endl;
- elapsedTimeEnroute = now - i->getDepartureTime();
- remainingTimeEnroute = i->getArrivalTime() - now;
+ elapsedTimeEnroute = now - (*i)->getDepartureTime();
+ remainingTimeEnroute = (*i)->getArrivalTime() - now;
}
else
{
//cout << "a = " << a[0] << " " << a[1] << " " << a[2]
// << "b = " << b[0] << " " << b[1] << " " << b[2] << endl;
- sgdMakeRotMat4(matrix, angle, cross);
+ sgdMat4 matrix;
+ sgdMakeRotMat4(matrix, angle, _cross.sg());
+ SGVec3d newPos(0, 0, 0);
for(int j = 0; j < 3; j++)
{
- newPos[j] =0.0;
for (int k = 0; k<3; k++)
{
newPos[j] += matrix[j][k]*a[k];
}
}
- temp = sgCartToPolar3d(Point3D(newPos[0], newPos[1],newPos[2]));
- if (now > i->getDepartureTime())
+ if (now > (*i)->getDepartureTime())
{
- //cerr << "Lat = " << lat << ", lon = " << lon << endl;
- //cerr << "Time diff: " << now-i->getDepartureTime() << endl;
- lat = temp.lat() * SG_RADIANS_TO_DEGREES;
- lon = temp.lon() * SG_RADIANS_TO_DEGREES;
+ SGGeoc geoc = SGGeoc::fromCart(newPos);
+ lat = geoc.getLatitudeDeg();
+ lon = geoc.getLongitudeDeg();
}
else
{
SGWayPoint current (lon,
lat,
- i->getCruiseAlt());
+ (*i)->getCruiseAlt(),
+ SGWayPoint::SPHERICAL);
SGWayPoint user ( userLongitude,
userLatitude,
- i->getCruiseAlt());
+ (*i)->getCruiseAlt(),
+ SGWayPoint::SPHERICAL);
SGWayPoint dest ( arr->getLongitude(),
arr->getLatitude(),
- i->getCruiseAlt());
+ (*i)->getCruiseAlt(),
+ SGWayPoint::SPHERICAL);
// We really only need distance to user
// and course to destination
user.CourseAndDistance(current, &courseToUser, &distanceToUser);
{
string flightPlanName = dep->getId() + string("-") + arr->getId() +
string(".xml");
- int alt;
+ //int alt;
//if ((i->getDepartureTime() < now))
//{
// alt = i->getCruiseAlt() *100;
// alt = dep->_elevation+19;
// }
- // Only allow traffic to be created when the model path exists
+ // Only allow traffic to be created when the model path (or the AI version of mp) exists
SGPath mp(globals->get_fg_root());
+ SGPath mp_ai = mp;
+
mp.append(modelPath);
- if (mp.exists())
+ mp_ai.append("AI");
+ mp_ai.append(modelPath);
+
+ if (mp.exists() || mp_ai.exists())
{
FGAIAircraft *aircraft = new FGAIAircraft(this);
aircraft->setPerformance(m_class); //"jet_transport";
//aircraft->setFlightPlan(flightPlanName);
aircraft->setLatitude(lat);
aircraft->setLongitude(lon);
- aircraft->setAltitude(i->getCruiseAlt()*100); // convert from FL to feet
+ aircraft->setAltitude((*i)->getCruiseAlt()*100); // convert from FL to feet
aircraft->setSpeed(speed);
aircraft->setBank(0);
aircraft->SetFlightPlan(new FGAIFlightPlan(flightPlanName, courseToDest, deptime,
dep, arr,true, radius,
- i->getCruiseAlt()*100,
+ (*i)->getCruiseAlt()*100,
lat, lon, speed, flightType, acType,
airline));
aimgr->attach(aircraft);
// Currently this status is mostly ignored, but in future
// versions, code should go here that -if within user range-
// positions these aircraft at parking locations at the airport.
- if ((i->getDepartureTime() > now) && (i->getArrivalTime() > now))
+ if (((*i)->getDepartureTime() > now) && ((*i)->getArrivalTime() > now))
{
- dep = i->getDepartureAirport();
+ dep = (*i)->getDepartureAirport();
return true;
}
}
void FGAISchedule::next()
{
- flights.begin()->update();
- sort(flights.begin(), flights.end());
+ (*flights.begin())->update();
+ sort(flights.begin(), flights.end(), compareScheduledFlights);
}
double FGAISchedule::getSpeed()
{
- double courseToUser, courseToDest;
- double distanceToUser, distanceToDest;
+ double courseToDest;
+ double distanceToDest;
double speed, remainingTimeEnroute;
FGAirport *dep, *arr;
FGScheduledFlightVecIterator i = flights.begin();
- dep = i->getDepartureAirport();
- arr = i->getArrivalAirport ();
+ dep = (*i)->getDepartureAirport();
+ arr = (*i)->getArrivalAirport ();
if (!(dep && arr))
return 0;
SGWayPoint dest ( dep->getLongitude(),
dep->getLatitude(),
- i->getCruiseAlt());
+ (*i)->getCruiseAlt(),
+ SGWayPoint::SPHERICAL);
SGWayPoint curr ( arr->getLongitude(),
arr->getLatitude(),
- i->getCruiseAlt());
- remainingTimeEnroute = i->getArrivalTime() - i->getDepartureTime();
+ (*i)->getCruiseAlt(),
+ SGWayPoint::SPHERICAL);
+ remainingTimeEnroute = (*i)->getArrivalTime() - (*i)->getDepartureTime();
dest.CourseAndDistance(curr, &courseToDest, &distanceToDest);
speed = (distanceToDest*SG_METER_TO_NM) /
((double) remainingTimeEnroute/3600.0);
return speed;
}
+bool compareSchedules(FGAISchedule*a, FGAISchedule*b)
+{
+ return (*a) < (*b);
+}
+
// void FGAISchedule::setClosestDistanceToUser()
// {
// }
// //return distToUser;
// }
+
projects / flightgear.git / blobdiff