-
Notifications
You must be signed in to change notification settings - Fork 659
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
matrix pbf output #4121
Merged
Merged
matrix pbf output #4121
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
ffcd93a
start with matrix pbf output; only specified the proto schema so far …
nilsnolde 6331656
only change the matrix functions signatures to accept an Api object r…
nilsnolde 8cec20c
finish the implementation; adapt all matrix algos to keep track of th…
nilsnolde fafd730
remove sources & targets from the output, add changelog
nilsnolde f124625
fix valhalla_run_matrix & remove some log statements
nilsnolde e2ccd88
fix benchmkar
nilsnolde 6e507ef
hmm.. matrix tests are failing.. look into it..
nilsnolde 3e88d7b
todo: proper order for reverse td matrix & off-by-one issues in dista…
nilsnolde 41e3065
[skip ci] start the work to let proto pack the matrix pbf better
nilsnolde 79d2fae
revert to flat repeated fields in the matrix PBF in favor of a repeat…
nilsnolde 46733c4
Merge branch 'nn-matrix-pbf' of github.com:valhalla/valhalla into nn-…
nilsnolde ef053ef
Merge branch 'master' into nn-matrix-pbf
nilsnolde 90d2d5e
tidy
nilsnolde 31b010b
add a test for #4153
nilsnolde d7cb821
throw in test for osrm matrix format to increase coverage again..
nilsnolde 0264285
reserve pbf date_times
nilsnolde 2d5caf0
Merge branch 'master' into nn-matrix-pbf
nilsnolde 44a0369
Merge branch 'master' into nn-matrix-pbf
nilsnolde 49b4429
Merge branch 'master' into nn-matrix-pbf
nilsnolde File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
syntax = "proto3"; | ||
option optimize_for = LITE_RUNTIME; | ||
package valhalla; | ||
import public "common.proto"; | ||
|
||
message Matrix { | ||
enum Algorithm { | ||
TimeDistanceMatrix = 0; | ||
CostMatrix = 1; | ||
} | ||
|
||
repeated uint32 distances = 2; | ||
repeated float times = 3; | ||
repeated uint32 from_indices = 4; | ||
repeated uint32 to_indices = 5; | ||
repeated string date_times = 6; | ||
Algorithm algorithm = 7; | ||
} |
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the MatrixType enum we kept around and replaced it with the PBF's one.