|
@@ -96,7 +96,7 @@ class Worker(Thread):
|
|
|
if 0 != report.distanceToIAF and '' != report.initialApproachFix:
|
|
|
inbound = Inbound(report, self.sequencingConfiguration, self.Configuration.GngData, self.PerformanceData, self.WeatherModel)
|
|
|
if None != inbound.PlannedRunway and None != inbound.PlannedStar:
|
|
|
- self.RecedingHorizonControl.update(inbound)
|
|
|
+ self.RecedingHorizonControl.updateReport(inbound)
|
|
|
else:
|
|
|
print('Unable to find all data of ' + report.aircraft.callsign)
|
|
|
|
|
@@ -127,8 +127,7 @@ class Worker(Thread):
|
|
|
if None != aco.Result:
|
|
|
print('ACO-Sequence:')
|
|
|
for inbound in aco.Result:
|
|
|
- print(' ' + inbound.Callsign + ': ' + inbound.PlannedRunway.Name + ' @ ' + str(inbound.PlannedArrivalTime) +
|
|
|
- ' dt=' + str((inbound.PlannedArrivalTime - inbound.InitialArrivalTime).total_seconds()))
|
|
|
+ self.RecedingHorizonControl.resequenceInbound(inbound)
|
|
|
print('Delays: FCFS=' + str(aco.FcfsDelay.total_seconds()) + ', ACO=' + str(aco.ResultDelay.total_seconds()))
|
|
|
|
|
|
# measure the exuction time of the overall optimization process
|