From 3d87c3918b659f8092c68c54b7ef19d8cc050a0f Mon Sep 17 00:00:00 2001 From: Sven Czarnian Date: Wed, 10 Nov 2021 22:50:00 +0100 Subject: [PATCH] remove some debugging todos --- aman/sys/RecedingHorizonControl.py | 4 +--- aman/sys/Worker.py | 3 +-- aman/sys/aco/Colony.py | 8 -------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/aman/sys/RecedingHorizonControl.py b/aman/sys/RecedingHorizonControl.py index 7219623..be52932 100644 --- a/aman/sys/RecedingHorizonControl.py +++ b/aman/sys/RecedingHorizonControl.py @@ -101,9 +101,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)): + for i in range(self.FreezedIndex + 1, min(len(self.Windows), self.FreezedIndex + 1 + self.Configuration.WindowOverlap)): if None == earliestArrivalTime: earliestArrivalTime = self.Windows[i].StartTime for inbound in self.Windows[i].Inbounds: diff --git a/aman/sys/Worker.py b/aman/sys/Worker.py index 757a4d4..603df3b 100644 --- a/aman/sys/Worker.py +++ b/aman/sys/Worker.py @@ -81,8 +81,7 @@ class Worker(Thread): while None == self.StopThread: time.sleep(1) counter += 1 - # TODO change the counter to some useful values - if 0 != (counter % 10): + if 0 != (counter % 60): continue self.acquireLock() diff --git a/aman/sys/aco/Colony.py b/aman/sys/aco/Colony.py index 7c377fb..7e3bfa3 100644 --- a/aman/sys/aco/Colony.py +++ b/aman/sys/aco/Colony.py @@ -29,15 +29,7 @@ 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 - inbound.ArrivalCandidates[runway].MaximumTimeToGain - inbound.ArrivalCandidates[runway].LatestArrivalTime = tmp + inbound.ArrivalCandidates[runway].MaximumTimeToLose - tmp += timedelta(seconds = 20) Colony.associateInbound(rwyManager, inbound, earliestArrivalTime, False) overallDelay += inbound.PlannedArrivalTime - inbound.InitialArrivalTime print(' ' + inbound.Callsign + ': ' + inbound.PlannedRunway.Name + ' @ ' + str(inbound.PlannedArrivalTime) +