vatger/aman-sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the theoretical earliest arrival time

Browse Source
This commit is contained in:
Sven Czarnian
2021-10-13 21:42:45 +02:00
parent 9887aa48a4
commit 5295d1c155
1 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
aman/sys/RecedingHorizonControl.py
View File

@@ -31,33 +31,24 @@ class RecedingHorizonControl:
plannedInbound = self.Windows[index].inbound(inbound.Report.aircraft.callsign)
plannedInbound.CurrentPosition = inbound.CurrentPosition
plannedInbound.MaximumTimeToGain = inbound.MaximumTimeToGain
# check if not accessed by the optimizer
if plannedInbound.InitialArrivalTime == plannedInbound.EstimatedArrivalTime:
notPlanned = True
update = True
# check if the ITA is greater or the ETA
elif plannedInbound.EstimatedArrivalTime != inbound.InitialArrivalTime:
notPlanned = False
update = True
# get the reference time and update some times in case no replacement is needed
if plannedInbound.InitialArrivalTime == plannedInbound.EarliestArrivalTime + plannedInbound.MaximumTimeToGain:
plannedInbound.InitialArrivalTime = inbound.InitialArrivalTime
plannedInbound.EarliestArrivalTime = inbound.EarliestArrivalTime
plannedInbound.EstimatedArrivalTime = inbound.EstimatedArrivalTime
reference = inbound.EarliestArrivalTime
else:
plannedInbound.InitialArrivalTime = inbound.InitialArrivalTime
if plannedInbound.EarliestArrivalTime < inbound.EarliestArrivalTime:
plannedInbound.EarliestArrivalTime = inbound.EarliestArrivalTime
if plannedInbound.EstimatedArrivalTime < inbound.EstimatedArrivalTime:
plannedInbound.EstimatedArrivalTime = inbound.EstimatedArrivalTime
reference = plannedInbound.EarliestArrivalTime
# update the windows
if True == update:
if inbound.InitialArrivalTime >= self.Windows[index].StartTime and inbound.InitialArrivalTime < self.Windows[index].EndTime:
keepInWindow = True
else:
keepInWindow = False
# check if planning can be updated or needs to be due to a delay
if True == notPlanned or plannedInbound.Inbound.EstimatedArrivalTime < inbound.InitialArrivalTime:
# keep it in this bucket
if True == keepInWindow:
plannedInbound.EstimatedArrivalTime = inbound.InitialArrivalTime
plannedInbound.InitialArrivalTime = inbound.InitialArrivalTime
self.Windows[index].Inbounds.sort(key = lambda x: x.EstimatedArrivalTime)
# put it in the new bucket
else:
if reference < self.Windows[index].StartTime or reference >= self.Windows[index].EndTime:
self.Windows[index].remove(inbound.Report.aircraft.callsign)
self.AssignedWindow.pop(inbound.Report.aircraft.callsign)
self.update(inbound)
@@ -67,7 +58,7 @@ class RecedingHorizonControl:
window = self.Windows[i]
# find the correct window
if window.StartTime <= inbound.EstimatedArrivalTime and window.EndTime > inbound.EstimatedArrivalTime:
if window.StartTime <= inbound.EarliestArrivalTime and window.EndTime > inbound.EarliestArrivalTime:
if i > self.FreezedIndex:
self.AssignedWindow[inbound.Report.aircraft.callsign] = [ i, 0 ]
window.insert(inbound)
@@ -84,10 +75,10 @@ class RecedingHorizonControl:
while True:
self.Windows.append(RecedingHorizonWindow(lastWindowTime, lastWindowTime + timestep))
if self.Windows[-1].EndTime > inbound.EstimatedArrivalTime:
if self.Windows[-1].EndTime > inbound.EarliestArrivalTime:
self.AssignedWindow[inbound.Report.aircraft.callsign] = [ len(self.Windows) - 1, 0 ]
self.Windows[-1].insert(inbound)
self.Windows[-1].Inbounds.sort(key = lambda x: x.EstimatedArrivalTime)
self.Windows[-1].Inbounds.sort(key = lambda x: x.EarliestArrivalTime)
break
lastWindowTime = self.Windows[-1].EndTime