From 4fbe9d10608970971c97cd44fc903a7b806569d8 Mon Sep 17 00:00:00 2001 From: Sven Czarnian Date: Tue, 14 Dec 2021 11:23:18 +0100 Subject: [PATCH] refactor the ETA estimation --- aman/sys/aco/RunwayManager.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/aman/sys/aco/RunwayManager.py b/aman/sys/aco/RunwayManager.py index 2613f8f..eefb942 100644 --- a/aman/sys/aco/RunwayManager.py +++ b/aman/sys/aco/RunwayManager.py @@ -50,13 +50,11 @@ class RunwayManager: arrivalTime = node.ArrivalCandidates[runway].InitialArrivalTime if None == constrainedETA: - return max(arrivalTime, earliestArrivalTime), timedelta(seconds = 0) + eta = max(arrivalTime, earliestArrivalTime) else: eta = max(constrainedETA, earliestArrivalTime) - if eta < arrivalTime: - return arrivalTime, arrivalTime - eta - else: - return eta, timedelta(seconds = 0) + + return eta, eta - arrivalTime def selectShallShouldMayArrivalRunway(self, node : Node, runways, useETA : bool, earliestArrivalTime : datetime): candidate = None