steps towards including initial transfers in traveltimes algorithm for …

…#88
UrbanAnalyst · Aug 16, 2022 · 83f178d · 83f178d
1 parent cff8b6a
commit 83f178d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: gtfsrouter
 Title: Routing with GTFS (General Transit Feed Specification) Data
-Version: 0.0.5.093
+Version: 0.0.5.094
 Authors@R: c(
     person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre")),
     person("Marcin", "Stepniak", , "marcinstepniak@ucm.es", role = "aut",

diff --git a/codemeta.json b/codemeta.json
@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/ATFutures/gtfs-router",
   "issueTracker": "https://github.com/ATFutures/gtfs-router/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.0.5.093",
+  "version": "0.0.5.094",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/src/traveltimes.cpp b/src/traveltimes.cpp
@@ -64,6 +64,8 @@ void iso::trace_forward_iso (
                             trans_dest,
                             trans_duration,
                             minimise_transfers,
+                            start_time,
+                            false, // !is_start
                             iso);
                 }
 
@@ -285,6 +287,28 @@ void iso::trace_forward_traveltimes (
     for (size_t a: arrival_station)
         stations.emplace (std::make_pair (a, false));
 
+    // Fill initial transfers from start station:
+    for (auto s: start_stations_set)
+    {
+        for (auto t: transfer_map.at (s))
+        {
+            const size_t trans_dest = t.first;
+            const int trans_duration = t.second;
+
+            iso::fill_one_transfer (
+                    INFINITE_INT, // departure_station param
+                    s, // arrival_station param
+                    start_time_min, // arrival_time param
+                    trans_dest,
+                    trans_duration,
+                    minimise_transfers,
+                    start_time_min,
+                    true, // is_start
+                    iso);
+
+        } // end for t over transfer map
+    } // end for s over start_stations_set
+
     for (size_t i = 0; i < nrows; i++)
     {
         if (departure_time [i] < start_time_min)
@@ -328,6 +352,8 @@ void iso::trace_forward_traveltimes (
                             trans_dest,
                             trans_duration,
                             minimise_transfers,
+                            start_time_min,
+                            false, // !is_start
                             iso);
 
                     if (stations.find (trans_dest) !=
@@ -359,6 +385,8 @@ void iso::fill_one_transfer (
         const size_t &trans_dest,
         const int &trans_duration,
         const bool &minimise_transfers,
+        const int &start_time,
+        const bool &is_start,
         Iso &iso)
 {
     const int trans_time = arrival_time + trans_duration;
@@ -372,7 +400,7 @@ void iso::fill_one_transfer (
         insert_transfer = iso::is_transfer_in_isochrone (
                 iso, arrival_station, trans_time);
 
-    if (!insert_transfer)
+    if (!insert_transfer && !is_start)
         return;
 
     if (iso.earliest_departure [trans_dest] == INFINITE_INT ||
@@ -417,14 +445,19 @@ void iso::fill_one_transfer (
     }
 
     iso.connections [trans_dest].convec [s].ntransfers = ntransfers + 1;
+    if (is_start)
+    {
+        latest_initial = start_time;
+    }
     iso.connections [trans_dest].convec [s].initial_depart = latest_initial;
 
     DEBUGMSGTR("---TR: (" << arrival_station << " -> " <<
             trans_dest << "), time(" <<
             arrival_time << " -> " <<
             trans_time << ") - " << latest_initial <<
             " = " << trans_time - latest_initial <<
-            "s with " << ntransfers << " transfers",
+            "s with " << ntransfers << " transfers" <<
+            "; INITIAL DEPART = " << latest_initial,
             trans_dest, arrival_time);
 }