|
@@ -21,7 +21,7 @@ class RunwayManager:
|
|
|
if not runway.Runway.Name in self.RunwayInbounds:
|
|
|
self.RunwayInbounds[runway.Runway.Name] = None
|
|
|
|
|
|
- def calculateEarliestArrivalTime(self, runway : str, node : Node, useETA : bool, earliestArrivalTime : datetime):
|
|
|
+ def calculateEarliestArrivalTime(self, runway : str, node : Node, earliestArrivalTime : datetime):
|
|
|
constrainedETA = None
|
|
|
|
|
|
if None != self.RunwayInbounds[runway]:
|
|
@@ -42,40 +42,29 @@ class RunwayManager:
|
|
|
if None == constrainedETA or candidate > constrainedETA:
|
|
|
constrainedETA = candidate
|
|
|
|
|
|
- # get the arrival time on the runway of the inbound
|
|
|
- if True == useETA:
|
|
|
- arrivalTime = node.ArrivalCandidates[runway].EarliestArrivalTime
|
|
|
- else:
|
|
|
- arrivalTime = node.ArrivalCandidates[runway].InitialArrivalTime
|
|
|
-
|
|
|
if None == constrainedETA:
|
|
|
- eta = max(arrivalTime, earliestArrivalTime)
|
|
|
+ eta = max(node.ArrivalCandidates[runway].InitialArrivalTime, earliestArrivalTime)
|
|
|
else:
|
|
|
- eta = max(arrivalTime, max(constrainedETA, earliestArrivalTime))
|
|
|
+ eta = max(node.ArrivalCandidates[runway].InitialArrivalTime, max(constrainedETA, earliestArrivalTime))
|
|
|
|
|
|
- return eta, eta - arrivalTime
|
|
|
+ return eta, eta - node.ArrivalCandidates[runway].InitialArrivalTime
|
|
|
|
|
|
- def selectShallShouldMayArrivalRunway(self, node : Node, runways, useETA : bool, earliestArrivalTime : datetime):
|
|
|
+ def selectShallShouldMayArrivalRunway(self, node : Node, runways, earliestArrivalTime : datetime):
|
|
|
candidate = None
|
|
|
delay = None
|
|
|
|
|
|
for runway in runways:
|
|
|
- if True == useETA:
|
|
|
- reference = node.ArrivalCandidates[runway.Runway.Name].EarliestArrivalTime
|
|
|
- else:
|
|
|
- reference = node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime
|
|
|
-
|
|
|
- eta, _ = self.calculateEarliestArrivalTime(runway.Runway.Name, node, useETA, earliestArrivalTime)
|
|
|
+ eta, _ = self.calculateEarliestArrivalTime(runway.Runway.Name, node, earliestArrivalTime)
|
|
|
if None == delay:
|
|
|
- delay = eta - reference
|
|
|
+ delay = eta - node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime
|
|
|
candidate = runway
|
|
|
- elif delay > (eta - reference):
|
|
|
- delay = eta- reference
|
|
|
+ elif delay > (eta - node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime):
|
|
|
+ delay = eta- node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime
|
|
|
candidate = runway
|
|
|
|
|
|
return candidate
|
|
|
|
|
|
- def executeShallShouldMayAssignment(self, node : Node, useETA : bool, earliestArrivalTime : datetime):
|
|
|
+ def executeShallShouldMayAssignment(self, node : Node, earliestArrivalTime : datetime):
|
|
|
shallRunways = []
|
|
|
shouldRunways = []
|
|
|
mayRunways = []
|
|
@@ -97,46 +86,41 @@ class RunwayManager:
|
|
|
if node.Inbound.Report.plannedGate in runway.ShouldAssignments[RunwayAssignmentType.GateAssignment]:
|
|
|
shouldRunways.append(runway)
|
|
|
|
|
|
- if True == useETA:
|
|
|
- reference = node.ArrivalCandidates[runway.Runway.Name].EarliestArrivalTime
|
|
|
- else:
|
|
|
- reference = node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime
|
|
|
-
|
|
|
# test the may assignments
|
|
|
if RunwayAssignmentType.AircraftType in runway.MayAssignments:
|
|
|
if node.Inbound.Report.aircraft.type in runway.MayAssignments[RunwayAssignmentType.AircraftType]:
|
|
|
- eta, _ = self.calculateEarliestArrivalTime(runway.Runway.Name, node, useETA, earliestArrivalTime)
|
|
|
- if (eta - reference) <= self.Configuration.AirportConfiguration.MaxDelayMay:
|
|
|
+ eta, _ = self.calculateEarliestArrivalTime(runway.Runway.Name, node, earliestArrivalTime)
|
|
|
+ if (eta - node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime) <= self.Configuration.AirportConfiguration.MaxDelayMay:
|
|
|
mayRunways.append(runway)
|
|
|
if RunwayAssignmentType.GateAssignment in runway.MayAssignments:
|
|
|
if node.Inbound.Report.plannedGate in runway.MayAssignments[RunwayAssignmentType.GateAssignment]:
|
|
|
- eta, _ = self.calculateEarliestArrivalTime(runway.Runway.Name, node, useETA, earliestArrivalTime)
|
|
|
- if (eta - reference) <= self.Configuration.AirportConfiguration.MaxDelayMay:
|
|
|
+ eta, _ = self.calculateEarliestArrivalTime(runway.Runway.Name, node, earliestArrivalTime)
|
|
|
+ if (eta - node.ArrivalCandidates[runway.Runway.Name].InitialArrivalTime) <= self.Configuration.AirportConfiguration.MaxDelayMay:
|
|
|
mayRunways.append(runway)
|
|
|
|
|
|
- runway = self.selectShallShouldMayArrivalRunway(node, shallRunways, useETA, earliestArrivalTime)
|
|
|
+ runway = self.selectShallShouldMayArrivalRunway(node, shallRunways, earliestArrivalTime)
|
|
|
if None != runway:
|
|
|
return [ runway ]
|
|
|
- runway = self.selectShallShouldMayArrivalRunway(node, shouldRunways, useETA, earliestArrivalTime)
|
|
|
+ runway = self.selectShallShouldMayArrivalRunway(node, shouldRunways, earliestArrivalTime)
|
|
|
if None != runway:
|
|
|
return [ runway ]
|
|
|
- runway = self.selectShallShouldMayArrivalRunway(node, mayRunways, useETA, earliestArrivalTime)
|
|
|
+ runway = self.selectShallShouldMayArrivalRunway(node, mayRunways, earliestArrivalTime)
|
|
|
if None != runway:
|
|
|
return [ runway ]
|
|
|
|
|
|
return self.Configuration.RunwayConstraints.ActiveArrivalRunways
|
|
|
|
|
|
- def selectArrivalRunway(self, node : Node, useETA : bool, earliestArrivalTime : datetime):
|
|
|
+ def selectArrivalRunway(self, node : Node, earliestArrivalTime : datetime):
|
|
|
availableRunways = self.Configuration.RunwayConstraints.ActiveArrivalRunways
|
|
|
|
|
|
if True == self.Configuration.RunwayConstraints.UseShallShouldMay:
|
|
|
- availableRunways = self.executeShallShouldMayAssignment(node, useETA, earliestArrivalTime)
|
|
|
+ availableRunways = self.executeShallShouldMayAssignment(node, earliestArrivalTime)
|
|
|
else:
|
|
|
availableRunways = self.Configuration.RunwayConstraints.ActiveArrivalRunways
|
|
|
|
|
|
if 0 == len(availableRunways):
|
|
|
runway = self.Configuration.RunwayConstraints.ActiveArrivalRunways[0]
|
|
|
- return runway, self.calculateEarliestArrivalTime(runway.Runway.Name, node, useETA, earliestArrivalTime)
|
|
|
+ return runway, self.calculateEarliestArrivalTime(runway.Runway.Name, node, earliestArrivalTime)
|
|
|
|
|
|
# start with the beginning
|
|
|
selectedRunway = None
|
|
@@ -145,7 +129,7 @@ class RunwayManager:
|
|
|
|
|
|
# get the runway with the earliest ETA
|
|
|
for runway in availableRunways:
|
|
|
- candidate, delta = self.calculateEarliestArrivalTime(runway.Runway.Name, node, useETA, earliestArrivalTime)
|
|
|
+ candidate, delta = self.calculateEarliestArrivalTime(runway.Runway.Name, node, earliestArrivalTime)
|
|
|
if None == eta or eta > candidate:
|
|
|
selectedRunway = runway.Runway
|
|
|
lostTime = delta
|