Kaynağa Gözat

remove some debugging todos

Sven Czarnian 3 yıl önce
ebeveyn
işleme
3d87c3918b

+ 1 - 3
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:

+ 1 - 2
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()

+ 0 - 8
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) +