Merge Logistics (LSP) into freight contrib #3602
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
Code maintenance...
…he vehicleType is added from the vehicle's information when "addVehicle" is called ; shorten some builder patterns
… package-private infrastructure.
…nto kmt_2chelon4diss2
more code maintenance
Add an integration test and some refactoring
…atsim-all-2025.0-2024w46 Bump org.matsim:matsim-all from 2025.0-2024w42 to 2025.0-2024w46
reactivate runCarrieranalysis,after fix in matsim-libs#3561
update import for annotation remove NotNull annotation
remove dependency to vsp contrib, as it is no longer needed
fix indentation (and therefore syntax) error
more preparation for ShipmentBased VRP planning
# Conflicts: # .github/dependabot.yml # .gitignore # README.md # pom.xml
7 tasks
7 tasks
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 an updated version of #3590
In the current PR, I excluded the usage of the scenario for the tests (from matsim-examples, which I already published in #3591 ) and focus only on the move of the project.
I am doing this, because I got stuck in accessing this data from matsim-examples in GH Actions -.- (see #3590 (comment))
With this PR, the code of the logistics service provider (LSP) gets merged from https://github.com/matsim-vsp/logistics/ into the freight contrib.
It opens the possibility to simulate logistic chains, including different carriers and hubs.
The original code base including a lot of tests was written by Tilman Matteis (DLR). @kainagel and I updated over the last years, using more and more of the standard MATSim approach.
Now it is time to extend the existing freight contrib with it.
Two papers using this LSP work at VSP can be found under https://vsp.berlin/publications/ : 22-22 and 24-05.