Aimsun fixes (#753)

* get rid of save prompt in aimsun

* bug: getLanesLength2D sums all lane lengths

* was using wrong key for speed limit

* add flow directory to PYTHONPATH

* length2D is the proper way to get edge length

flow/core/kernel/network/aimsun.py

@@ -103,6 +103,8 @@ def generate_network(self, network):
         if os.path.exists(check_file_path):
             os.remove(check_file_path)
 
+        # we need to make flow directories visible to aimsun's python2.7
+        os.environ["PYTHONPATH"] = config.PROJECT_PATH
         # path to the supplementary file that is used to generate an aimsun
         # network from a template
         template_path = network.net_params.template

flow/utils/aimsun/generate.py

@@ -275,7 +275,7 @@ def generate_net(nodes,
         config.PROJECT_PATH, "flow/utils/aimsun/run.py"), True)
 
     # save
-    gui.saveAs('flow.ang')
+    gui.save(model, 'flow.ang', GGui.GGuiSaveType.eSaveAs)
 
 
 def generate_net_osm(file_name, inflows, veh_types):
@@ -374,7 +374,7 @@ def generate_net_osm(file_name, inflows, veh_types):
         config.PROJECT_PATH, "flow/utils/aimsun/run.py"), True)
 
     # save
-    gui.saveAs('flow.ang')
+    gui.save(model, 'flow.ang', GGui.GGuiSaveType.eSaveAs)
 
 
 def get_junctions(nodes):
@@ -685,7 +685,7 @@ def create_meter(model, edge):
     """
     section = model.getCatalog().findByName(edge, model.getType("GKSection"))
     meter_length = 2
-    pos = section.getLanesLength2D() - meter_length
+    pos = section.length2D() - meter_length
     type = model.getType("GKMetering")
     cmd = model.createNewCmd(model.getType("GKSectionObject"))
     # TODO double check the zeros
@@ -825,7 +825,7 @@ def set_sim_step(experiment, sim_step):
         for s in types.itervalues():
             s_id = s.getId()
             num_lanes = s.getNbFullLanes()
-            length = s.getLanesLength2D()
+            length = s.length2D()
             speed = s.getSpeed()
             edge_osm[s_id] = {"speed": speed,
                               "length": length,

flow/utils/aimsun/load.py

@@ -72,11 +72,8 @@ def get_dict_from_objects(sections, nodes, turnings, cen_connections):
         scenario_data['sections'][s.id] = {
             'name': s.name,
             'numLanes': s.nb_full_lanes,
-            # FIXME this is a mean of the lanes lengths
-            # (bc they don't have to be all of the same size)
-            # it may not be 100% accurate
-            'length': s.lanes_length_2D / s.nb_full_lanes,
-            'max_speed': s.speed
+            'length': s.length2D(),
+            'speed': s.speed
         }
 
     # load nodes