print out directory info for output functions

- output_columns(), output_link_performance(), output_agent_paths(),
  _output_accessibility(), and _output_accessibility_aggregated();
- rename _check_connectivity() to _are_od_connected();
- if _are_od_connected() returns false, do not set up the volume for
  the corresponding OD pair.

Author: jdlph

path4gmns/accessibility.py

@@ -1,3 +1,4 @@
+import os
 import csv
 import threading
 
@@ -73,6 +74,14 @@ def _output_accessibility(min_travel_times, output_dir='.'):
             line = [k[0], '', k[1], '', v, '']
             writer.writerow(line)
 
+        if output_dir == '.':
+            print('\ncheck accessibility.csv in '
+                  +os.getcwd()+' for accessibility matrix')
+        else:
+            print('\ncheck accessibility.csv in '
+                  +os.path.join(os.getcwd(), output_dir)
+                  +' for accessibility matrix')
+
 
 def _output_accessibility_aggregated(min_travel_times, interval_num,
                                      zones, ats, output_dir='.'):
@@ -115,6 +124,14 @@ def _output_accessibility_aggregated(min_travel_times, interval_num,
                 line.extend(counts)
                 writer.writerow(line)
 
+        if output_dir == '.':
+            print('\ncheck accessibility_aggregated.csv in '
+                  +os.getcwd()+' for aggregated accessibility matrix')
+        else:
+            print('\ncheck accessibility_aggregated.csv in '
+                  +os.path.join(os.getcwd(), output_dir)
+                  +' for aggregated accessibility matrix')
+
 
 def evaluate_accessibility(ui, multimodal=True, output_dir='.'):
     base = ui._base_assignment

path4gmns/utils.py

@@ -1,5 +1,5 @@
-import csv
 import os
+import csv
 import threading
 
 from .classes import Node, Link, Network, Column, ColumnVec, VDFPeriod, \
@@ -47,17 +47,24 @@ def _update_dest_zone(dz_id):
         _zone_degrees[dz_id] = 3
 
 
-def _check_connectivity(oz_id, dz_id):
+def _are_od_connected(oz_id, dz_id):
+    connected = True
+
     # at least one node in O must have outgoing links
     if _zone_degrees[oz_id] == 0 or _zone_degrees[oz_id] == 2:
-        print(f'WARNING! {oz_id} has no outgoing links to route volume'
+        connected = False
+        print(f'WARNING! {oz_id} has no outgoing links to route volume '
               f'between OD: {oz_id} --> {dz_id}')
 
     # at least one node in D must have incoming links
     if _zone_degrees[dz_id] == 0 or _zone_degrees[dz_id] == 1:
-        print(f'WARNING! {dz_id} has no incoming links to route volume'
+        if connected:
+            connected = False
+        print(f'WARNING! {dz_id} has no incoming links to route volume '
               f'between OD: {oz_id} --> {dz_id}')
 
+    return connected
+
 
 def _convert_str_to_int(str):
     """
@@ -400,7 +407,7 @@ def read_links(input_dir,
             from_node.add_outgoing_link(link)
             to_node.add_incoming_link(link)
             links.append(link)
-            
+
             # set up zone degrees
             # 0: isolated, has neither outgoing links nor incoming links
             # 1: has at least one outgoing link
@@ -456,20 +463,20 @@ def read_demand(input_dir,
             if volume is None:
                 continue
 
+            if volume == 0:
+                continue
+
+            # precheck on connectivity of each OD pair
+            if not _are_od_connected(oz_id, dz_id):
+                continue
+
             # set up volume for ColumnVec
             if (at, dp, oz_id, dz_id) not in column_pool.keys():
                 column_pool[(at, dp, oz_id, dz_id)] = ColumnVec()
             column_pool[(at, dp, oz_id, dz_id)].od_vol += volume
 
-            if volume == 0:
-                continue
-
             total_agents += int(volume + 1)
 
-            # precheck on connectivity of each OD pair
-            _check_connectivity(oz_id, dz_id)
-
-
     print(f"the number of agents is {total_agents}")
 
 
@@ -799,6 +806,14 @@ def output_columns(ui, output_geometry=True, output_dir='.'):
 
                 writer.writerow(line)
 
+        if output_dir == '.':
+            print('\ncheck agent.csv in '
+                  +os.getcwd()+' for path finding results')
+        else:
+            print('\ncheck agent.csv in '
+                  +os.path.join(os.getcwd(), output_dir)
+                  +' for path finding results')
+
 
 def output_link_performance(ui, output_dir='.'):
     with open(output_dir+'/link_performance.csv', 'w',  newline='') as fp:
@@ -843,6 +858,14 @@ def output_link_performance(ui, output_dir='.'):
 
                 writer.writerow(line)
 
+        if output_dir == '.':
+            print('\ncheck link_performance.csv in '
+                  +os.getcwd()+' for link performance')
+        else:
+            print('\ncheck link_performance.csv in '
+                  +os.path.join(os.getcwd(), output_dir)
+                  +' for link performance')
+
 
 def output_agent_paths(ui, output_geometry=True, output_dir='.'):
     with open(output_dir+'/agent_paths.csv', 'w',  newline='') as f:
@@ -902,4 +925,12 @@ def output_agent_paths(ui, output_geometry=True, output_dir='.'):
                     base.get_agent_link_path(agent_id, True),
                     geometry]
 
-            writer.writerow(line)
+            writer.writerow(line)
+
+        if output_dir == '.':
+            print('\ncheck agent_paths.csv in '
+                   +os.getcwd()+' for unique agent paths')
+        else:
+            print('\ncheck agent_paths.csv in '
+                  +os.path.join(os.getcwd(), output_dir)
+                  +' for unique agent paths')

tests/demo.py

@@ -56,8 +56,8 @@ def test_column_generation_py():
     print('\nstart column generation\n')
     st = time()
 
-    iter_num = 10
-    column_update_num = 10
+    iter_num = 20
+    column_update_num = 20
     pg.perform_network_assignment(1, iter_num, column_update_num, network)
 
     print(f'processing time of column generation: {time()-st:.2f} s'
@@ -69,8 +69,6 @@ def test_column_generation_py():
     pg.output_columns(network)
     pg.output_link_performance(network)
 
-    print('\npath finding results can be found in agent.csv')
-
 
 def test_column_generation_dtalite():
     """ validation using DTALite """
@@ -113,8 +111,6 @@ def test_loading_columns():
     pg.output_columns(network)
     pg.output_link_performance(network)
 
-    print('\npath finding results can be found in agent.csv')
-
 
 def test_accessibility():
     load_demand = False
@@ -127,8 +123,6 @@ def test_accessibility():
 
     print('complete accessibility evaluation.\n')
     print(f'processing time of accessibility evaluation: {time()-st:.2f} s')
-    print('accessibility matrices can be found in accessibility.csv '
-          'and accessibility_aggregated.csv\n')
 
     # get accessible nodes and links starting from node 1 with a 5-minitue 
     # time window for the default mode auto (i.e., 'p')
@@ -171,4 +165,4 @@ def demo_mode(mode):
 
 if __name__=="__main__":
 
-    demo_mode(3)
+    demo_mode(6)