wip

Author: felixguendling

include/nigiri/loader/gtfs/seated.h

@@ -15,10 +15,12 @@ struct expanded_seated {
   vecvec<seated_idx_t, utc_trip> expanded_;
 };
 
-void build_seated_trips(timetable&,
-                        trip_data&,
-                        expanded_seated&,
-                        std::function<void(utc_trip&&)> const& consumer);
+std::vector<utc_trip> build_seated_trips(
+    timetable&,
+    hash_map<bitfield, bitfield_idx_t>&,
+    trip_data&,
+    expanded_seated&,
+    mutable_fws_multimap<location_idx_t, route_idx_t>&);
 
 template <typename Fn>
 expanded_seated expand_seated_trips(trip_data const& trip_data, Fn&& expand) {

include/nigiri/seated_transfer.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "nigiri/types.h"
+
+namespace nigiri {
+
+struct seated_transfer {
+  using value_t = route_idx_t;
+
+  seated_transfer(value_t const val) {
+    std::memcpy(this, &val, sizeof(value_t));
+  }
+  seated_transfer(route_idx_t const target, std::int8_t const day_offset)
+      : target_{to_idx(target)},
+        day_offset_{static_cast<route_idx_t::value_t>(day_offset)} {}
+
+  route_idx_t::value_t value() const noexcept {
+    return *reinterpret_cast<location_idx_t::value_t const*>(this);
+  }
+
+  cista::hash_t hash() const {
+    return cista::hash_combine(cista::BASE_HASH, value());
+  }
+
+  std::uint8_t day_offset() const noexcept { return day_offset_; }
+  route_idx_t target() const noexcept { return route_idx_t{target_}; }
+
+  route_idx_t::value_t target_ : 24;
+  route_idx_t::value_t day_offset_ : 8;
+};
+
+static_assert(sizeof(seated_transfer) == sizeof(route_idx_t));
+
+}  // namespace nigiri

include/nigiri/timetable.h

@@ -20,6 +20,7 @@
 #include "nigiri/footpath.h"
 #include "nigiri/location.h"
 #include "nigiri/logging.h"
+#include "nigiri/seated_transfer.h"
 #include "nigiri/stop.h"
 #include "nigiri/string_store.h"
 #include "nigiri/td_footpath.h"
@@ -183,6 +184,11 @@ struct timetable {
       }
     }
 
+    route_has_seated_in_.resize(route_has_seated_in_.size() + 1U);
+    route_has_seated_out_.resize(route_has_seated_out_.size() + 1U);
+    route_seated_transfers_in_.add_back_sized(0U);
+    route_seated_transfers_out_.add_back_sized(0U);
+
     return route_idx_t{idx};
   }
 
@@ -461,6 +467,16 @@ struct timetable {
   // same for cars
   vecvec<route_idx_t, bool> route_cars_allowed_per_section_;
 
+  // Route -> has outgoing stay-seated transfers
+  bitvec route_has_seated_out_;
+
+  // Route -> has incoming stay-seated transfers
+  bitvec route_has_seated_in_;
+
+  // Route -> seated transfers
+  vecvec<route_idx_t, seated_transfer::value_t> route_seated_transfers_out_;
+  vecvec<route_idx_t, seated_transfer::value_t> route_seated_transfers_in_;
+
   // Location -> list of routes
   vecvec<location_idx_t, route_idx_t> location_routes_;
 

src/loader/gtfs/load_timetable.cc

@@ -337,6 +337,7 @@ void load_timetable(loader_config const& config,
     }
   }
 
+  auto location_routes = mutable_fws_multimap<location_idx_t, route_idx_t>{};
   {
     auto const timer = scoped_timer{"loader.gtfs.write_seated"};
     auto expanded_seated = expand_seated_trips(
@@ -345,7 +346,8 @@ void load_timetable(loader_config const& config,
                       trip_data.get(i).service_, tt.date_range_, assistance,
                       [&](utc_trip&& s) { consume(std::move(s)); });
         });
-    build_seated_trips(tt, trip_data, expanded_seated, add_expanded_trip);
+    build_seated_trips(tt, bitfield_indices, trip_data, expanded_seated,
+                       location_routes);
   }
 
   {
@@ -361,7 +363,6 @@ void load_timetable(loader_config const& config,
     auto section_directions = basic_string<trip_direction_idx_t>{};
     auto route_colors = basic_string<route_color>{};
     auto external_trip_ids = basic_string<merged_trips_idx_t>{};
-    auto location_routes = mutable_fws_multimap<location_idx_t, route_idx_t>{};
     for (auto const& [key, sub_routes] : route_services) {
       for (auto const& services : sub_routes) {
         auto const route_idx = tt.register_route(