Merge a494150 into 0b518f6

flow/core/kernel/network/aimsun.py

@@ -120,7 +120,7 @@ def generate_network(self, network):
                 f.write(template_path)
 
         # start the aimsun process
-        aimsun_call = [aimsun_path, "-script", script_path]
+        aimsun_call = [aimsun_path, "-script", script_path, str(self.sim_params.port)]
         self.aimsun_proc = subprocess.Popen(aimsun_call)
 
         # merge types into edges

flow/core/kernel/simulation/aimsun.py

@@ -61,9 +61,6 @@ def start_simulation(self, network, sim_params):
         a simulation, and creates a class to communicate with the simulation
         via an TCP connection.
         """
-        # FIXME: hack
-        sim_params.port = 9999
-
         # save the simulation step size (for later use)
         self.sim_step = sim_params.sim_step
 

flow/utils/aimsun/generate.py

@@ -29,6 +29,9 @@
            "EPSG:32601")
 model = gui.getActiveModel()
 
+# HACK: Store port in author
+port_string = sys.argv[1]
+model.setAuthor(port_string)
 
 def generate_net(nodes,
                  edges,

flow/utils/aimsun/load.py

@@ -5,6 +5,7 @@
 
 import flow.config as config
 from flow.utils.aimsun.scripting_api import AimsunTemplate
+import sys
 
 
 def load_network():
@@ -134,6 +135,10 @@ def get_dict_from_objects(sections, nodes, turnings, cen_connections):
 model = AimsunTemplate(GKSystem, GKGUISystem)
 model.load(template_path)
 
+# HACK: Store port in author
+port_string = sys.argv[1]
+model.setAuthor(port_string)
+
 # collect the simulation parameters
 params_file = 'flow/core/kernel/network/data.json'
 params_path = os.path.join(config.PROJECT_PATH, params_file)

flow/utils/aimsun/run.py

@@ -16,7 +16,8 @@
 from thread import start_new_thread
 import numpy as np
 
-PORT = 9999
+model = GKSystem.getSystem().getActiveModel()
+PORT = int(model.getAuthor())
 entered_vehicles = []
 exited_vehicles = []