add fare zone based pt pricing #3382
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
…umbers still missing
|
@rakow please have a look here |
|
@GregorRyb please check out this branch and test if it works for your scenario |
nkuehnel
added a commit
to moia-oss/matsim-libs
that referenced
this pull request
Aug 13, 2024
* make drt shifts multi mode drt comatible * adjust shift efficiency tracker as well * Extended Trip analysis and dashboard (matsim-org#3332) * trip analysis for subgroups * refactor categories * write trip analysis * write out correct table * use static method * prepare for facets, add TODOs * start working on plotly facet integration * Added Test Trip Dashboard for Facets * update API * add trip choice analysis * adding test case and some todos * calculating some trip choice metrics * add choice metrics to trip dashboard * hide tab if not needed * add text box and round metrics * normalize shares per reference group correctly, added some facet dashboards (WIP) * fix pivot usage * rename entries * add plots for distance distributions * add todo * use dropdown for plots * add cohen kappa to evaluation * output euclidean distance for trip choices * add ref_id attribute * added heatmap to TripDashboard * update description * allow arbitrary object for ref ids * show heatmap labels * comment out trip dashboard wip part * use correct logger * improve wording --------- Co-authored-by: frievoe97 <[email protected]> * Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.apache.maven.plugins:maven-surefire-report-plugin Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.1 to 3.4.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.4.1...maven-jar-plugin-3.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump com.fasterxml.woodstox:woodstox-core from 6.6.2 to 7.0.0 Bumps [com.fasterxml.woodstox:woodstox-core](https://github.com/FasterXML/woodstox) from 6.6.2 to 7.0.0. - [Commits](FasterXML/woodstox@woodstox-core-6.6.2...woodstox-core-7.0.0) --- updated-dependencies: - dependency-name: com.fasterxml.woodstox:woodstox-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.jfree:jfreechart from 1.5.4 to 1.5.5 Bumps [org.jfree:jfreechart](https://github.com/jfree/jfreechart) from 1.5.4 to 1.5.5. - [Release notes](https://github.com/jfree/jfreechart/releases) - [Commits](jfree/jfreechart@v1.5.4...v1.5.5) --- updated-dependencies: - dependency-name: org.jfree:jfreechart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * make drt work with only custom constraints sets * add some logging to NetworkChangeEventsWriter * correct logging statement * add router binding for complex request unscheduling * use time as disutility * Bump junit.version from 5.10.2 to 5.10.3 Bumps `junit.version` from 5.10.2 to 5.10.3. Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.2 to 5.10.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.10.2...r5.10.3) Updates `org.junit.jupiter:junit-jupiter` from 5.10.2 to 5.10.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * * repair wrong positioning of vehicles if linkSpeedCalculator returns speed larger than free speed * replace some (but not all) link.getAttributes()... by BicycleUtils.set/getXyz( link, ...) * bind BicycleConfigGroup explicitly in BicycleModule so that not materializing it before does not lead to a non-interpretable error message (stating that Scenario is not bound about 20 times although that is not the root of the problem) * possibly one or the other additional things * norm subgroups to 1 (matsim-org#3346) * add tests for mode restriction * add test integration test case for complex unscheduler * Bump io.grpc:grpc-all from 1.64.0 to 1.65.0 Bumps [io.grpc:grpc-all](https://github.com/grpc/grpc-java) from 1.64.0 to 1.65.0. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](grpc/grpc-java@v1.64.0...v1.65.0) --- updated-dependencies: - dependency-name: io.grpc:grpc-all dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * add tests that depict the current behaviour * Bump com.google.protobuf:protobuf-java from 4.27.1 to 4.27.2 Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 4.27.1 to 4.27.2. - [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-patch ... Signed-off-by: dependabot[bot] <[email protected]> * implement multiple mode test * Split CalculateSkimMatrices.prepareAndCalculateNetworkMatrices() to allow for custom travel times objects * implement option for network inconsistency check; no test adaptation so far * Bump org.checkerframework:checker-qual from 3.44.0 to 3.45.0 Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.44.0 to 3.45.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](typetools/checker-framework@checker-framework-3.44.0...checker-framework-3.45.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * implemented network changer * implement functionality in Util classes and moved config * implement test using the new functionality for mode restriction * revert changing the default access egress type * Switch to DrtWithExtensionsConfigGroup * Bump org.apache.poi:poi-ooxml from 5.2.5 to 5.3.0 Bumps org.apache.poi:poi-ooxml from 5.2.5 to 5.3.0. --- updated-dependencies: - dependency-name: org.apache.poi:poi-ooxml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * explicitly set access egress type * fix test failures in contribs * fix test failures in contribs and add config parameter so relevant functions * reworked CreatePseudoNetwork with loop-links to avoid duplicating stops * repair test failures * Trip facet dashboard (matsim-org#3350) * implement dropdown facets on the trip dashboard * implement dropdown facets on the trip dashboard * added backgroundColor attribute and restyled text seperators * set backgroundcolor on all plots --------- Co-authored-by: rakow <[email protected]> * adjust rounding * exclude case * Drt dashboard typo fix (matsim-org#3360) * added tooltip for gridmap/emissionsDashboard * fix typo in drt dashboard --------- Co-authored-by: rakow <[email protected]> * Bump com.fasterxml.jackson:jackson-bom from 2.17.1 to 2.17.2 Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.1 to 2.17.2. - [Commits](FasterXML/jackson-bom@jackson-bom-2.17.1...jackson-bom-2.17.2) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump net.bytebuddy:byte-buddy from 1.14.17 to 1.14.18 Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.17 to 1.14.18. - [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.17...byte-buddy-1.14.18) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * set networkMode based on vehicleTypes * pass lambda function as parameter * Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.0 to 3.26.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.26.0...assertj-build-3.26.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * chore: clean up MinimalTransferTimes (matsim-org#3365) * chore: cleanup adaptive transfers (matsim-org#3366) * chore: cleanup adaptvie transfers * make final * Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.0 to 3.3.1 Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * add missing case of enum * add functionality to split jobs * use new methods * update activity creation * set activity time correctly * remove unneeded exception * change to parameterized log message * delete empty test methods * remove unused import * fix unchecked assignment * remove redundant local variables * minor code style update * remove not needed throw information * make things final * remove redundant final declaration * remove unnecessary 'throws' declarations * simplify assertions * cleanup Strings * remove redundant casts * code style update * cleanup imports * Java language: Replace explicit type with <> * Java language: use computeIfAbsent * Java language: use Double.hashCode(...) * Java language: replace if by switch * Java language: avoid raw use * Java language: use text block * Java language: use pattern variable * Java language: use add/getFirst() * Access to TestUtils.EPSILION * add not null assertion * remove one layer of "LSPs" * add prebooking support for drt shifts some minor shift cleanups possibility to assign requests to shifts that are assigned bot not started yet * cancel assigned shifts * Bump com.google.errorprone:error_prone_annotations from 2.28.0 to 2.29.2 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.28.0 to 2.29.2. - [Release notes](https://github.com/google/error-prone/releases) - [Commits](google/error-prone@v2.28.0...v2.29.2) --- updated-dependencies: - dependency-name: com.google.errorprone:error_prone_annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * add some documentation * shift drt maintenance * some more drt shift maintenance * consider break corridors for (pre)bookings * consider break corridors for (pre)bookings * clean up obsolete method * update FISS test, reduce iterations to reduce runtime * avoid abandoning prebooked requests twice in the same time step * fix tests by disabling net consistency check * adapt error messages * remove redundant suppression * remove unused field * internal renaming * remove unnecessary toString() calls * remove unnecessary semicolon * inline and remove method * cleanup imports * simplification * make final, internal renaming * replace 'if' by 'switch' * simplification * use enhanced 'switch' * simplification * use 'getFirst()' * javadoc: replace blank lines with '<p>' * javadoc: set link as a link * logging: use parameterized logging * add casting * simplification * use 'append()' calls * simplification by removing inaccessibly parts of if statements. * remove duplicated setting of variable * Simplify assertions * Simplify stream * avoid casting * suppress warning * fix some (language) grammar * fix some typos * more simplifications * cleanup: remove commented out code * small cleanups * fix test failures by disable net consistency check * optimize h3 zone system initialization; move h3 test to common module * shift drt maintenance; fix bug for prebooked e-drt scenarios that need shifts to be assignable to requests in advance; change priority queues in shift dispatcher to sorted sets to ensure correct iteration order * make FISS integration test less sensible to smaller changes in link events * set level of some logging's back from WARN to DEBUG * SimWrapper Dashboard features (matsim-org#3381) * add explanations to the traffic dashboard, add pt viewer dashboard * add additional description * add avg beeline speed to trip dashboard * added mode share distance distribution * added plot for detailed distance distribution * upscale emission dashboard with sample size * Update GenerateFreightPlans.java (matsim-org#3387) Fixing one typo in "GenerateFreightPlans.java" and some minor updates in the input sample size interpretation and output naming. No changes in the functionality. * add events files comparison * more (javadoc) comments * add test which includes tolling. One test is failing, because it is not possible to create different schemes for the different types. * WIP: Prepare test for tolling with factor. Not implemented to the end now -> Disabled. * replace self-build RoadPricingCalculator with official RoadPricingScheme * adapt test: use tollFactor * add option if person==null * more tests * more steps forward * fix one test: Use MATSim's vehicles * fix the last test: Building the netbased costs without MATSim's vehicle types * some cleanup and javadoc * fix typos, internal renaming * Bump org.apache.maven.plugins:maven-surefire-report-plugin Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump io.grpc:grpc-all from 1.65.0 to 1.65.1 Bumps [io.grpc:grpc-all](https://github.com/grpc/grpc-java) from 1.65.0 to 1.65.1. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](grpc/grpc-java@v1.65.0...v1.65.1) --- updated-dependencies: - dependency-name: io.grpc:grpc-all dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump commons-codec:commons-codec from 1.17.0 to 1.17.1 Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.17.0 to 1.17.1. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](apache/commons-codec@rel/commons-codec-1.17.0...rel/commons-codec-1.17.1) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Preserve the working directory when gui is run from cli (matsim-org#3391) * use asterisk for act type default * NoiseAnalysis: set the scale factor for according to sample size * add fare zone based pt pricing (matsim-org#3382) * first try to implement fare zone based pt pricing, deutschlandtarif numbers still missing * put deutschlandtarif price linear functions into code * unit test for FareZoneBasedPtFareHandler * better defaults for NoiseDashboard * remove the static * NoiseAnalysis: more explicit parameter settings + bug fix in MergeNoiseOutput * Update DRT estimate and teleport module (matsim-org#3333) Re-organizing the DRT estimation scripts. For more details, please see detailed description above. * NoiseAnalysis: merge damages files * NoiseDashboard: include stats and damage plots * only perform net consistency check once * CreateSingleSimWrapperDashboard * fix noise tests: explicitly set activity types for rp grid, when setting act type for damage calculation * fix nasty insertion scheduler bug --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: rakow <[email protected]> Co-authored-by: frievoe97 <[email protected]> Co-authored-by: Joschka Bischoff <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kainagel <[email protected]> Co-authored-by: Kai Nagel <[email protected]> Co-authored-by: Paul Heinrich <[email protected]> Co-authored-by: Michal Maciejewski <[email protected]> Co-authored-by: marecabo <[email protected]> Co-authored-by: steffenaxer <[email protected]> Co-authored-by: u229351 <[email protected]> Co-authored-by: frievoe97 <[email protected]> Co-authored-by: Ricardo Ewert <[email protected]> Co-authored-by: Ricardo Ewert <[email protected]> Co-authored-by: Paul Heinrich <[email protected]> Co-authored-by: Sebastian Hörl <[email protected]> Co-authored-by: Kai Martins-Turner <[email protected]> Co-authored-by: Kai Martins-Turner <[email protected]> Co-authored-by: tschlenther <[email protected]> Co-authored-by: Chengqi Lu <[email protected]> Co-authored-by: simei94 <[email protected]>
This was referenced Aug 20, 2024
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.
This is the result of a calibration task force meeting, where we agreed to this distance + fare zone based pricing scheme.