use the optimization thresholds to calculate the TTG

This commit is contained in:
Sven Czarnian
2021-12-15 09:28:59 +01:00
parent 72959a8e26
commit 5242fe0d87
5 changed files with 21 additions and 14 deletions

View File

@@ -87,7 +87,7 @@ class Worker(Thread):
if 0 != report.distanceToIAF and '' != report.initialApproachFix:
inbound = Inbound(report, self.PerformanceData)
Node(inbound, inbound.ReportTime, self.WeatherModel, self.Configuration.GngData, self.SequencingConfiguration)
Node(inbound, inbound.ReportTime, self.WeatherModel, self.Configuration, self.SequencingConfiguration)
if None != inbound.InitialArrivalTime:
self.RecedingHorizonControl.updateReport(inbound)
else:
@@ -109,11 +109,10 @@ class Worker(Thread):
preceedingInbounds[runway.Runway.Name] = Node(inbound, None, None, None, None)
# configure the ACO run
acoConfig = Configuration(constraints = self.SequencingConfiguration, nav = self.Configuration.GngData,
acoConfig = Configuration(constraints = self.SequencingConfiguration, config = self.Configuration,
earliest = earliestArrivalTime, weather = self.WeatherModel,
preceeding = None if 0 == len(preceedingInbounds) else preceedingInbounds,
ants = 5 * len(relevantInbounds), generations = 5 * len(relevantInbounds),
maxDelayMay=self.Configuration.MaxDelayMay)
ants = 5 * len(relevantInbounds), generations = 5 * len(relevantInbounds))
# perform the ACO run
aco = Colony(relevantInbounds, acoConfig)