Update matsim #75
Merged
Update matsim #75
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
Make TripsAndLegsWriter public again
Draft: DRT - consolidate request insertion schedulers for default and shift implementation
# Conflicts: # contribs/application/src/test/java/org/matsim/application/options/ShpOptionsTest.java # matsim/src/test/java/org/matsim/analysis/ScoreStatsControlerListenerTest.java # matsim/src/test/java/org/matsim/analysis/TripsAndLegsWriterTest.java # matsim/src/test/java/org/matsim/core/config/ReflectiveConfigGroupTest.java
…BookingConsolidation
Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.2...surefire-3.2.3) --- 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]>
…BookingConsolidation # Conflicts: # contribs/drt/src/test/java/org/matsim/contrib/drt/sharingmetrics/SharingFactorTest.java # contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/PassengerGroupTest.java
…om.google.guava-guava-33.0.0-jre build(deps): bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…rg.apache.maven.plugins-maven-compiler-plugin-3.12.0 build(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.0
…ngConsolidation Draft: DRT consolidate prebookings and group bookings
…ansfer-times Feature/improve transfer times
Drt: fix occupancy change calculation at waypoints to account for group requests
Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.10 to 1.14.11. - [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.10...byte-buddy-1.14.11) --- 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]>
…et.bytebuddy-byte-buddy-1.14.11 build(deps-dev): bump net.bytebuddy:byte-buddy from 1.14.10 to 1.14.11
Bumps [io.grpc:grpc-all](https://github.com/grpc/grpc-java) from 1.60.0 to 1.60.1. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](grpc/grpc-java@v1.60.0...v1.60.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]>
…o.grpc-grpc-all-1.60.1 build(deps): bump io.grpc:grpc-all from 1.60.0 to 1.60.1
Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/google/error-prone/releases) - [Commits](google/error-prone@v2.23.0...v2.24.0) --- 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]>
…om.google.errorprone-error_prone_annotations-2.24.0 build(deps): bump com.google.errorprone:error_prone_annotations from 2.23.0 to 2.24.0
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.16.0 to 2.16.1. - [Commits](FasterXML/jackson-bom@jackson-bom-2.16.0...jackson-bom-2.16.1) --- 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]>
…om.fasterxml.jackson-jackson-bom-2.16.1 build(deps): bump com.fasterxml.jackson:jackson-bom from 2.16.0 to 2.16.1
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.12.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…rg.apache.maven.plugins-maven-compiler-plugin-3.12.1 build(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.0 to 3.12.1
TomE168
approved these changes
Dec 27, 2023
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.
No description provided.