flow problem and cosmetic adjustments

Author: azhow

modules/experiment/experiment.py

@@ -8,6 +8,7 @@
 import os
 from time import localtime
 import string
+import math
 #Third-party module
 from py_expression_eval import Parser
 #Local modules
@@ -139,7 +140,7 @@ def init_network_data(self, k, network_file, group_size, flow, print_edges):
         #instance
         self.drivers = []
         for od_pair in self.ODlist:
-            for i in range(od_pair.numTravels):
+            for i in range(int(math.ceil(od_pair.numTravels))):
                 self.drivers.append(Driver(od_pair))
 
     def __repr__(self):
@@ -308,9 +309,7 @@ def createStringArguments(self, useQL, useInt):
         path = fmt % (self.network_name, self.mutation)
 
         filename = '/net' + self.network_name + '_pm' + str(self.mutation) + '_c' \
-                 + str(self.crossover) + '_e' + str(self.elite) + '_k' + str(self.k) + '_nd' \
-                 + str(nd(self.drivers, self.group_size)) + '_groupsize' + str(self.group_size)
-
+                 + str(self.crossover) + '_e' + str(self.elite) + '_k' + str(self.k)
 
         headerstr = "#Parameters:" + "\n#\tGenerations=" + str(self.generations) + "\tPopulation=" \
                   + str(self.population) + "\n#\tMutation=" + str(self.mutation) + "\tCrossover=" \

modules/functions/functions.py

@@ -168,7 +168,7 @@ def generate_graph(graph_file, print_edges=False, flow=0):
                                   freeflow_cost, cost_formula))
 
         elif taglist[0] == 'od':
-            od_list.append((taglist[2], taglist[3], int(taglist[4])))
+            od_list.append((taglist[2], taglist[3], float(taglist[4])))
     '''
     Print edges and their costs but there are too many lines to be printed!!
     '''