cosmetic changes in quotes

- use single quotes consistently;
- include perform_network_assignment in __all__ of colgen.py.

Author: jdlph

path4gmns/classes.py

@@ -415,7 +415,7 @@ def setup_agents(self, column_pool):
         #     agent.agent_seq_no = i
 
         self.agent_size = len(self.agent_list)
-        print(f"the number of agents is {self.agent_size}")
+        print(f'the number of agents is {self.agent_size}')
 
     def _get_agent(self, agent_no):
         """ retrieve agent using agent_no """
@@ -848,7 +848,7 @@ def get_node_no(self, node_id):
         try:
             return self.node_id_to_no[node_id]
         except KeyError:
-            raise(f"EXCEPTION: Node ID {node_id} NOT IN THE NETWORK!!")
+            raise(f'EXCEPTION: Node ID {node_id} NOT IN THE NETWORK!!')
 
     def get_agent_type(self):
         return self.agent_type
@@ -1028,7 +1028,6 @@ def set_target_mode(self, mode):
         ----------
         mode : agent name which is in settings.yml.
         """
-        # assert(mode in ['p', 'w', 'b', 'a'])
         self.agent_type_name = mode
 
     def set_source_node_id(self, node_id):
@@ -1379,7 +1378,7 @@ def get_node_label_cost(self, node_no):
     def get_accessible_nodes(self, source_node_id, time_budget,
                              mode, time_dependent, tau):
         if source_node_id not in self.network.node_id_to_no_dict.keys():
-            raise Exception(f"Node ID: {source_node_id} not in the network")
+            raise Exception(f'Node ID: {source_node_id} not in the network')
 
         assert(time_budget>=0)
 

path4gmns/colgen.py

@@ -5,7 +5,7 @@
 from .consts import MIN_OD_VOL, MAX_LABEL_COST, SMALL_DIVISOR
 
 
-__all__ = ['perform_column_generation']
+__all__ = ['perform_column_generation', 'perform_network_assignment']
 
 
 def _update_generalized_link_cost(spnetworks):
@@ -197,7 +197,7 @@ def _optimize_column_pool(column_pool,
                           column_update_num):
 
     for i in range(column_update_num):
-        print(f"current iteration number in column generation: {i}")
+        print(f'current iteration number in column generation: {i}')
         _update_column_gradient_cost_and_flow(column_pool,
                                               links,
                                               agent_types,
@@ -363,7 +363,7 @@ def perform_column_generation(iter_num, column_update_num, ui):
     st = time()
 
     for i in range(iter_num):
-        print(f"current iteration number in assignment: {i}")
+        print(f'current iteration number in assignment: {i}')
         _update_link_travel_time_and_cost(links)
 
         _reset_and_update_link_vol_based_on_columns(column_pool,
@@ -425,4 +425,4 @@ def perform_network_assignment(assignment_mode, iter_num, column_update_num, ui)
             'Please please use perform_network_assignment_DTALite().'
         )
 
-    perform_column_generation(iter_num, column_update_num, ui)
+    perform_column_generation(iter_num, column_update_num, ui)

path4gmns/path.py

@@ -278,9 +278,9 @@ def _get_path_cost(G, to_node_id):
 
 def find_shortest_path(G, from_node_id, to_node_id, seq_type='node'):
     if from_node_id not in G.node_id_to_no_dict.keys():
-        raise Exception(f"Node ID: {from_node_id} not in the network")
+        raise Exception(f'Node ID: {from_node_id} not in the network')
     if to_node_id not in G.node_id_to_no_dict.keys():
-        raise Exception(f"Node ID: {to_node_id} not in the network")
+        raise Exception(f'Node ID: {to_node_id} not in the network')
 
     single_source_shortest_path(G, from_node_id, engine_type='c')
 
@@ -320,9 +320,9 @@ def find_path_for_agents(G, column_pool, engine_type='c'):
             continue
 
         if from_node_id not in G.node_id_to_no_dict.keys():
-            raise Exception(f"Node ID: {from_node_id} not in the network")
+            raise Exception(f'Node ID: {from_node_id} not in the network')
         if to_node_id not in G.node_id_to_no_dict.keys():
-            raise Exception(f"Node ID: {to_node_id} not in the network")
+            raise Exception(f'Node ID: {to_node_id} not in the network')
 
         # simple caching strategy
         # if the current from_node_id is the same as from_node_id_prev,

path4gmns/utils.py

@@ -202,14 +202,14 @@ def read_nodes(input_dir,
 
             node_seq_no += 1
 
-        print(f"the number of nodes is {node_seq_no}")
+        print(f'the number of nodes is {node_seq_no}')
 
         zone_size = len(zone_to_node_dict)
         # do not count virtual zone with id as -1
         if -1 in zone_to_node_dict.keys():
             zone_size -= 1
 
-        print(f"the number of zones is {zone_size}")
+        print(f'the number of zones is {zone_size}')
 
 
 def read_links(input_dir,
@@ -250,8 +250,8 @@ def read_links(input_dir,
                 from_node_no = id_to_no_dict[from_node_id]
                 to_node_no = id_to_no_dict[to_node_id]
             except KeyError:
-                print(f"EXCEPTION: Node ID {from_node_id} "
-                      f"or/and Node ID {to_node_id} NOT IN THE NETWORK!!")
+                print(f'EXCEPTION: Node ID {from_node_id} '
+                      f'or/and Node ID {to_node_id} NOT IN THE NETWORK!!')
                 continue
 
             # for the following attributes,
@@ -407,7 +407,7 @@ def read_links(input_dir,
 
             link_seq_no += 1
 
-        print(f"the number of links is {link_seq_no}")
+        print(f'the number of links is {link_seq_no}')
 
 
 def read_demand(input_dir,
@@ -463,7 +463,7 @@ def read_demand(input_dir,
 
             total_agents += int(volume + 1)
 
-        print(f"the number of agents is {total_agents}")
+        print(f'the number of agents is {total_agents}')
 
         if total_agents == 0:
             raise Exception('NO VALID OD VOLUME!! DOUBLE CHECK YOUR demand.csv')