Kaynağa Gözat

add the absolut minimal optimization value due RHC definition

Sven Czarnian 3 yıl önce
ebeveyn
işleme
3b8989508e
2 değiştirilmiş dosya ile 5 ekleme ve 2 silme
  1. 1 1
      aman/sys/Worker.py
  2. 4 1
      aman/sys/aco/Configuration.py

+ 1 - 1
aman/sys/Worker.py

@@ -121,7 +121,7 @@ class Worker(Thread):
                 print('Relevant inbounds: ' + str(len(relevantInbounds)))
 
                 # configure the ACO run
-                acoConfig = Configuration(self.sequencingConfiguration, 5 * len(relevantInbounds), 5 * len(relevantInbounds))
+                acoConfig = Configuration(earliestArrivalTime, self.sequencingConfiguration, 5 * len(relevantInbounds), 5 * len(relevantInbounds))
                 if 0 != len(preceedingInbounds):
                     acoConfig.PreceedingInbounds = preceedingInbounds
                 acoConfig.Inbounds = relevantInbounds

+ 4 - 1
aman/sys/aco/Configuration.py

@@ -1,13 +1,16 @@
 #!/usr/bin/env python
 
+from datetime import datetime
+
 from aman.config.AirportSequencing import AirportSequencing
 
 class Configuration:
-    def __init__(self, runwayInfo : AirportSequencing, antCount : int, explorationCount : int):
+    def __init__(self, earliestArrivalTime : datetime, runwayInfo : AirportSequencing, antCount : int, explorationCount : int):
         # the AMAN specific information
         self.RunwayConstraints = runwayInfo
         self.PreceedingInbounds = None
         self.Inbounds = None
+        self.EarliestArrivalTime = earliestArrivalTime
 
         # the ACO specific information
         self.AntCount = antCount