Procházet zdrojové kódy

add a flag that inidicates if the flight has all relevant information

Sven Czarnian před 3 roky
rodič
revize
bf6417c66c

+ 3 - 1
aman/sys/RecedingHorizonControl.py

@@ -115,6 +115,7 @@ class RecedingHorizonControl:
         sequenced.PlannedTrackmiles = inbound.PlannedTrackmiles
         sequenced.PlannedTrackmiles = inbound.PlannedTrackmiles
         sequenced.AssignmentMode = inbound.AssignmentMode
         sequenced.AssignmentMode = inbound.AssignmentMode
         sequenced.ExpectedRunway = inbound.ExpectedRunway
         sequenced.ExpectedRunway = inbound.ExpectedRunway
+        sequenced.HasValidSequence = True
 
 
         # resort the inbound
         # resort the inbound
         if sequenced.PlannedArrivalTime < self.Windows[index].StartTime or sequenced.PlannedArrivalTime >= self.Windows[index].EndTime:
         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 i in range(0, len(self.Windows)):
             for inbound in self.Windows[i].Inbounds:
             for inbound in self.Windows[i].Inbounds:
-                inbounds.append(inbound)
+                if True == inbound.HasValidSequence:
+                    inbounds.append(inbound)
 
 
         return inbounds
         return inbounds
 
 

+ 0 - 8
aman/sys/aco/Node.py

@@ -217,11 +217,3 @@ class Node:
 
 
                 if True == setEnrouteTime and (None == self.Inbound.EnrouteArrivalTime or ita < self.Inbound.EnrouteArrivalTime):
                 if True == setEnrouteTime and (None == self.Inbound.EnrouteArrivalTime or ita < self.Inbound.EnrouteArrivalTime):
                     self.Inbound.EnrouteArrivalTime = ita
                     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

+ 1 - 0
aman/types/Inbound.py

@@ -25,6 +25,7 @@ class Inbound:
         self.FixedSequence = False
         self.FixedSequence = False
         self.ExpectedRunway = None
         self.ExpectedRunway = None
         self.AssignmentMode = None
         self.AssignmentMode = None
+        self.HasValidSequence = False
         self.WTC = None
         self.WTC = None
 
 
         # analyze the WTC
         # analyze the WTC