Skip to content
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

Exception based scheduling #545

Merged
merged 15 commits into from
Nov 16, 2023
Merged

Conversation

br648
Copy link
Contributor

@br648 br648 commented Jun 23, 2023

Checklist

  • Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
  • Any modified or new methods or classes have helpful JavaDoc and code is thoroughly commented
  • The description lists all applicable issues this PR seeks to resolve
  • The description lists any configuration setting(s) that differ from the default settings
  • All tests and CI builds passing

Description

This PR includes the exception based scheduling updates made to GTFS-lib (conveyal/gtfs-lib#385) and a rector of feed merge to accommodate multiple table references.

@br648
Copy link
Contributor Author

br648 commented Jun 23, 2023

@binh-dam-ibigroup before i dive into a fix (to replace the temp fix that doesn't work) do you have any thoughts on how to approach this which might save me a bit of time?!

Copy link
Contributor

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@br648 I think this is headed in the right direction! (Add the tests for checking that the logic works.)

"%s:%s:%s",
table.name,
field.name,
field.referenceTables.stream().map(r -> r.name).collect(Collectors.joining(":"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully we don't rely extract values from keys by relying on the ":" separator.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've made changes to this in my latest update to use a more unque key.

@br648 br648 requested a review from binh-dam-ibigroup July 7, 2023 15:08
Copy link
Contributor

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well when merging two normal feeds!

@binh-dam-ibigroup
Copy link
Contributor

@br648 Remember to address the merge conflict.

@br648 br648 assigned philip-cline and unassigned br648 Jul 11, 2023
Copy link
Contributor

@philip-cline philip-cline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good to me, although I think we should probably hold off on merging until we've got a front end fix for full testing.

@philip-cline
Copy link
Contributor

Awaiting #567 to be merged

key now includes reference to schedule exceptions matching trip service_id references
@br648 br648 merged commit b3b79fe into dev Nov 16, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants