enable profilebased transfers in raptor #56
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t; added profile to query
- no_profiles >= 1 - profile > 0 - added vscode to gitignore
- removed invalid clear call - restructured two loops into one
(+) use at(idx) instead of [idx]
list of conflicts: * timetable.h (profiles removed -> added) * search.h (profiles removed -> added) * location.cc (profiles removed -> added) * reconstruct.cc (profiles removed -> added:365) * raptor_search.cc (profiles removed -> added:71/101) * start_times.h (profiles removed -> added:280)
15 tasks
added 5 commits
July 25, 2023 08:34
carstenhagelgans
changed the title
carstenhagelgans
force-pushed
the
profiles
branch
from
b237f4f to
3658ab3
Compare
felixguendling
pushed a commit
that referenced
this pull request
Nov 20, 2023
* set clang version to 15 * added profiles * added profile dimension to footpaths/preprocessing-footpaths; added osm_type * reset preprocessing footpaths to one profile only; set profile to uint; added profile to query * fixed invalid load call; fixed wrong param order * use array instead of vectors here: profile-based footpaths * added profiles as vector; updated several functions/methods to work with profiles * changed no_profiles and profile type from int to uint8_t - no_profiles >= 1 - profile > 0 - added vscode to gitignore * Update build_footpaths.cc - removed invalid clear call - restructured two loops into one * changed uint8_t [no_]profile to uint16_t * added profile-based footpath reinitialization * bugfix - uint8_t -> uint16_t - invalid method name - missing default value (no_profiles = 1) * use resize in reinit_footpaths * fixed type in osm_type_ (osm_types_) (+) use at(idx) instead of [idx] * added profile_idx map to tt.locations * fixed clang-tidy error * set profile in query as size_t * profile_idx (type): size_t/uint16_t -> uint * set clang version - 16 * wip - added profile_idx_t - removed osm_[...] structs and types - updated footpaths_[out, in] from vector to array - added kMaxProfiles (set to 8) - added array to nigiri types * cleanup * cleanup * added profiles map to timetable struct * added location key to locations * clang-tidy fix * cleanup * cleanup * removed location key to location idx mapping; using profile_idx_T * removed footpaths from location * cleanup * improved readability timetable --------- Co-authored-by: Carsten Hagelgans <carsten.hagelgans@tu-darmstadt.de>
felixguendling
pushed a commit
that referenced
this pull request
Nov 22, 2023
* set clang version to 15 * added profiles * added profile dimension to footpaths/preprocessing-footpaths; added osm_type * reset preprocessing footpaths to one profile only; set profile to uint; added profile to query * fixed invalid load call; fixed wrong param order * use array instead of vectors here: profile-based footpaths * added profiles as vector; updated several functions/methods to work with profiles * changed no_profiles and profile type from int to uint8_t - no_profiles >= 1 - profile > 0 - added vscode to gitignore * Update build_footpaths.cc - removed invalid clear call - restructured two loops into one * changed uint8_t [no_]profile to uint16_t * added profile-based footpath reinitialization * bugfix - uint8_t -> uint16_t - invalid method name - missing default value (no_profiles = 1) * use resize in reinit_footpaths * fixed type in osm_type_ (osm_types_) (+) use at(idx) instead of [idx] * added profile_idx map to tt.locations * fixed clang-tidy error * set profile in query as size_t * profile_idx (type): size_t/uint16_t -> uint * set clang version - 16 * wip - added profile_idx_t - removed osm_[...] structs and types - updated footpaths_[out, in] from vector to array - added kMaxProfiles (set to 8) - added array to nigiri types * cleanup * cleanup * added profiles map to timetable struct * added location key to locations * clang-tidy fix * cleanup * cleanup * removed location key to location idx mapping; using profile_idx_T * removed footpaths from location * cleanup * improved readability timetable --------- Co-authored-by: Carsten Hagelgans <carsten.hagelgans@tu-darmstadt.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added profilebased transfers using the new profile_idx_t type
transfers are calculated with ppr in motis in the transfers module (cf. module: transfers (profilebased) motis#373)
added restrictions struct (currently unused, awaiting implementation in motis)