diff --git a/aman/sys/Worker.py b/aman/sys/Worker.py index 3779dbe..8c947dd 100644 --- a/aman/sys/Worker.py +++ b/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 diff --git a/aman/sys/aco/Configuration.py b/aman/sys/aco/Configuration.py index 2087be5..82924b5 100644 --- a/aman/sys/aco/Configuration.py +++ b/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