factor out drt optimization constraint params from drt config group #3252
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
|
Another breaking change, but highly relevant for us |
michalmac
reviewed
May 5, 2024
There was a problem hiding this comment.
Some high-level feedback:
- I agree that the drt config is a bit messy now and requires some restructuring, the proposed grouping goes in that direction.
- It would be nice if the drt config had a structure that enables easy plugging in of different optimisers (so something more than this PR proposes)
- Because breaking the backward compatibility at the xml level may be quite painful for the users, I would consider maybe drafting "drt config v2" with a nice pluggability of different optimizers, while still keeping the current drt config backward compatible.
…s preparatory work for service differentiation
nkuehnel
force-pushed
the
factorOutDrtOptimizationConstrains
branch
from
94d6124
to
83a29ad
Compare
nkuehnel
commented
May 10, 2024
There was a problem hiding this comment.
@michalmac here is the added code for backwards compatibility
|
Based on #3027 I added a method to handle old config group files by using the handleUnknownParam method. There's also a test included which runs a test on the older version of mielec_drt_config_v1.xml
Not voting against it, but it would require some more effort.. let me know if this backwards compatibility works as well for now. ( @marecabo @steffenaxer fyi) |
Thanks! As long as this PR is backward compatible, I do not have any objections. BTW. I will not be able to review this PR by the end of next week, so please do not wait for my approval. |
Yeah, that was meant as food for thought, but not a blocker for this PR. |
|
Alright, thank you |
nkuehnel
added a commit
to moia-oss/matsim-libs
that referenced
this pull request
May 11, 2024
…atsim-org#3252) * factor out drt optimization constraint params from drt config group as preparatory work for service differentiation * ensure backwards compatibility with previous drt config design
nkuehnel
added a commit
to moia-oss/matsim-libs
that referenced
this pull request
May 27, 2024
* combined distribution of tour start and duration * add routing test with multiple same options * build(deps): bump info.picocli:picocli from 4.7.5 to 4.7.6 Bumps [info.picocli:picocli](https://github.com/remkop/picocli) from 4.7.5 to 4.7.6. - [Release notes](https://github.com/remkop/picocli/releases) - [Changelog](https://github.com/remkop/picocli/blob/main/RELEASE-NOTES.md) - [Commits](remkop/picocli@v4.7.5...v4.7.6) --- updated-dependencies: - dependency-name: info.picocli:picocli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps-dev): bump net.bytebuddy:byte-buddy from 1.14.14 to 1.14.15 Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.14 to 1.14.15. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.14.14...byte-buddy-1.14.15) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * add javadoc comment to constructor of OTFVisLiveModule * factor out drt optimization constraint params from drt config group (matsim-org#3252) * factor out drt optimization constraint params from drt config group as preparatory work for service differentiation * ensure backwards compatibility with previous drt config design * add python script to analysis kid data * add new events for new times distribution * add todo * change format of list creation * make output files of the class configurable * add trip filter for trip start OR end in shp area (matsim-org#3269) * read first 5 lines of csv to check delimiter (matsim-org#3271) * inline abstract module attributes and get rid of them * Allow for storing multiple DrtOptimizationConstraintsParams * recognize EPSG:4326 as equal to WGS84 when using special coordinate transformations (matsim-org#3276) * Add test * update to geotools 31 (resolve transitive dependency conflicts) (matsim-org#3272) * update to geotools 31 * update geotools import statements * remove gt-opengis as it is discontinued * build(deps): bump io.grpc:grpc-all from 1.63.0 to 1.64.0 Bumps [io.grpc:grpc-all](https://github.com/grpc/grpc-java) from 1.63.0 to 1.64.0. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](grpc/grpc-java@v1.63.0...v1.64.0) --- updated-dependencies: - dependency-name: io.grpc:grpc-all dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump org.mockito:mockito-core from 5.11.0 to 5.12.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.11.0...v5.12.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump org.mockito:mockito-junit-jupiter Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.11.0...v5.12.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * update gtfs2matsim in application contrib (matsim-org#3278) * build(deps): bump com.google.code.gson:gson from 2.10.1 to 2.11.0 Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md) - [Commits](google/gson@gson-parent-2.10.1...gson-parent-2.11.0) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Move optimization constraints params to optimizer package * add middleman for drt optimization constraints * re-order replanning parameter comments to make them more understandable (matsim-org#3280) * --- updated-dependencies: - dependency-name: jakarta.validation:jakarta.validation-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump org.apache.commons:commons-compress from 1.26.1 to 1.26.2 Bumps org.apache.commons:commons-compress from 1.26.1 to 1.26.2. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump com.google.protobuf:protobuf-java from 4.26.1 to 4.27.0 Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 4.26.1 to 4.27.0. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix bug in bicycle score handler (matsim-org#3288) * fix bicycle score handler * update test cases * update events * use new population comparison * fix: prebooked drt with variable stop durations and group sizes (matsim-org#3290) * fix: prebooked drt with variable stop durations and group sizes * fix logic * Documentation mode choice + make mode choice analysis standard (matsim-org#3285) * add comments to clarify configs * add ModeChoiceCoverageControlerListener as default analysis * fix tests * fix tests --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: rakow <rakow@vsp.tu-berlin.de> Co-authored-by: Paul Heinrich <pheinrich11235@gmail.com> Co-authored-by: Paul Heinrich <55242299+paulheinr@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michal Maciejewski <michalmac@users.noreply.github.com> Co-authored-by: Kai Nagel <nagel@vsp.tu-berlin.de> Co-authored-by: kainagel <kainagel@users.noreply.github.com> Co-authored-by: Ricardo Ewert <ewert@vsp.tu-berlin.de> Co-authored-by: Ricardo Ewert <60344745+rewertvsp@users.noreply.github.com> Co-authored-by: simei94 <67737999+simei94@users.noreply.github.com> Co-authored-by: marecabo <23156476+marecabo@users.noreply.github.com> Co-authored-by: rakow <rakow@users.noreply.github.com> Co-authored-by: vsp-gleich <vsp-gleich@users.noreply.github.com> Co-authored-by: Sebastian Hörl <sebastian.horl@irt-systemx.fr>
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.
preparatory work for service differentiation within a single service (i.e., different service classes express/wheelchair/disabled... or spatially dependent constraints)