Merge branch 'dev' of github.com:CxAalto/gtfspy into dev

gtfspy/routing/node_profile_analyzer_time_and_veh_legs.py

@@ -549,9 +549,9 @@ def plot_temporal_distance_pdf_horizontal(self, use_minutes=True, ax=None, durat
 
             journey_counts = numpy.zeros(len(temporal_distance_split_widths))
             for block_now in blocks_now:
-                start_index = numpy.searchsorted(distance_split_points_ordered, block_now.distance_start)
-                end_index = numpy.searchsorted(distance_split_points_ordered, block_now.distance_end)
-                journey_counts[start_index:end_index] += 1
+                first_index = numpy.searchsorted(distance_split_points_ordered, block_now.distance_end)
+                last_index = numpy.searchsorted(distance_split_points_ordered, block_now.distance_start)
+                journey_counts[first_index:last_index] += 1
 
             part_pdf = journey_counts / (self.end_time_dep - self.start_time_dep)
             pdf_areas[n_boardings] = sum(part_pdf * temporal_distance_split_widths)

gtfspy/stats.py

@@ -96,11 +96,20 @@ def write_stats_as_csv(gtfs, path_to_csv, re_write=False):
     if re_write:
             os.remove(path_to_csv)
 
-    if not os.path.isfile(path_to_csv):
-        is_new = True
-    else:
-        is_new = False
+    #if not os.path.isfile(path_to_csv):
+     #   is_new = True
+    #else:
+     #   is_new = False
 
+    is_new = True
+    mode = 'r' if os.path.exists(path_to_csv) else 'w+'
+    with open(path_to_csv, mode) as csvfile:
+        for line in csvfile:
+           if line:
+               is_new = False
+           else:
+               is_new = True
+
     with open(path_to_csv, 'a') as csvfile:
         if (sys.version_info > (3, 0)):
             delimiter = u","