From bf6417c66c842998796b8c13a7be710f7ec607cb Mon Sep 17 00:00:00 2001 From: Sven Czarnian Date: Sat, 25 Dec 2021 08:58:12 +0100 Subject: [PATCH] add a flag that inidicates if the flight has all relevant information --- aman/sys/RecedingHorizonControl.py | 4 +++- aman/sys/aco/Node.py | 8 -------- aman/types/Inbound.py | 1 + 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/aman/sys/RecedingHorizonControl.py b/aman/sys/RecedingHorizonControl.py index a651f61..9e97dc5 100644 --- a/aman/sys/RecedingHorizonControl.py +++ b/aman/sys/RecedingHorizonControl.py @@ -115,6 +115,7 @@ class RecedingHorizonControl: sequenced.PlannedTrackmiles = inbound.PlannedTrackmiles sequenced.AssignmentMode = inbound.AssignmentMode sequenced.ExpectedRunway = inbound.ExpectedRunway + sequenced.HasValidSequence = True # resort the inbound if sequenced.PlannedArrivalTime < self.Windows[index].StartTime or sequenced.PlannedArrivalTime >= self.Windows[index].EndTime: @@ -201,7 +202,8 @@ class RecedingHorizonControl: for i in range(0, len(self.Windows)): for inbound in self.Windows[i].Inbounds: - inbounds.append(inbound) + if True == inbound.HasValidSequence: + inbounds.append(inbound) return inbounds diff --git a/aman/sys/aco/Node.py b/aman/sys/aco/Node.py index 9857fde..5aba418 100644 --- a/aman/sys/aco/Node.py +++ b/aman/sys/aco/Node.py @@ -217,11 +217,3 @@ class Node: if True == setEnrouteTime and (None == self.Inbound.EnrouteArrivalTime or ita < self.Inbound.EnrouteArrivalTime): self.Inbound.EnrouteArrivalTime = ita - self.Inbound.PlannedRunway = identifier.Runway - self.Inbound.PlannedStar = star - self.Inbound.PlannedArrivalRoute = arrivalRoute - self.Inbound.PlannedArrivalTime = earliest - self.Inbound.InitialArrivalTime = earliest - self.Inbound.PlannedTrackmiles = trackmiles - self.Inbound.AssignmentMode = 'other' - self.Inbound.ExpectedRunway = None diff --git a/aman/types/Inbound.py b/aman/types/Inbound.py index 7ee99c4..e274bbb 100644 --- a/aman/types/Inbound.py +++ b/aman/types/Inbound.py @@ -25,6 +25,7 @@ class Inbound: self.FixedSequence = False self.ExpectedRunway = None self.AssignmentMode = None + self.HasValidSequence = False self.WTC = None # analyze the WTC