diff --git a/aman/sys/RecedingHorizonControl.py b/aman/sys/RecedingHorizonControl.py index e4b3508..2b406ef 100644 --- a/aman/sys/RecedingHorizonControl.py +++ b/aman/sys/RecedingHorizonControl.py @@ -100,6 +100,7 @@ class RecedingHorizonControl: earliestArrivalTime = None # check the overlapping windows + # TODO use this commented for loop after developing to use the correct windows #for i in range(self.FreezedIndex + 1, min(len(self.Windows), self.FreezedIndex + 1 + self.Configuration.WindowOverlap)): for i in range(0, len(self.Windows)): if None == earliestArrivalTime: diff --git a/aman/sys/aco/Colony.py b/aman/sys/aco/Colony.py index cd5088c..4a64052 100644 --- a/aman/sys/aco/Colony.py +++ b/aman/sys/aco/Colony.py @@ -29,8 +29,10 @@ class Colony: # assume that the inbounds are sorted in FCFS order print('FCFS-Sequence:') + # TODO remove this after testing and optimization tmp = datetime.now().replace(tzinfo = pytz.UTC) + timedelta(seconds = 50 * len(inbounds)) for inbound in inbounds: + # TODO remove this after testing and optimization for runway in inbound.ArrivalCandidates: inbound.ArrivalCandidates[runway].InitialArrivalTime = tmp inbound.ArrivalCandidates[runway].EarliestArrivalTime = tmp