Use TripPatterns for filtering - #4820
Merged
leonardehrenfried merged 12 commits intoFeb 16, 2023
Merged
Conversation
As routes can contain multiple modes
Basically free, compared to an iterator-based iteration
hannesj
added
!Bug
Codecov ReportBase: 62.14% // Head: 62.12% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #4820 +/- ##
=============================================
- Coverage 62.14% 62.12% -0.02%
- Complexity 13000 13005 +5
=============================================
Files 1650 1650
Lines 66064 66105 +41
Branches 7184 7198 +14
=============================================
+ Hits 41055 41070 +15
- Misses 22669 22688 +19
- Partials 2340 2347 +7
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
Member
|
I'm currently testing another fix for the Windows problem: 004eeb4 |
Merged
t2gran
requested changes
Feb 9, 2023
t2gran
left a comment
t2gran
left a comment
Member
There was a problem hiding this comment.
Looked fast through this and it looks ok.
hannesj
added
+Bump Serialization Id
t2gran
previously approved these changes
Feb 14, 2023
| // then we do not have to do that at all and it should increase performance a lot | ||
| // trip has to match with at least one predicate in order to be included in search | ||
| // Trip has to match with at least one predicate in order to be included in search. We only have | ||
| // to this if we have mode specific filters, and not all trips on hte pattern have the same |
Bartosz-Kruba
suggested changes
Feb 14, 2023
|
|
||
| public List<SelectRequest> not() { | ||
| return not; | ||
| return Collections.unmodifiableList(Arrays.asList(select)); |
Contributor
There was a problem hiding this comment.
I think this should be not
Contributor
Author
There was a problem hiding this comment.
No, we no longer expose not, as it did have no usage.
hannesj
commented
Feb 14, 2023
t2gran
approved these changes
Feb 15, 2023
leonardehrenfried
approved these changes
Feb 16, 2023
Bartosz-Kruba
approved these changes
Feb 16, 2023
Member
|
To unblock @Bartosz-Kruba I'm going to merge this. |
t2gran
pushed a commit
that referenced
this pull request
Feb 16, 2023
t2gran
pushed a commit
that referenced
this pull request
Feb 16, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary
There is a couple of issues with the current filtering code:
matchTripTimesdid not use thenotfilter.This fixes these issues, by doing the filtering on the pattern level instead, and adding a boolean flag on the pattern, containing information whether the pattern contains multiple modes or submodes.
Also some minor performance optimizations were done.