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

Merge Logistics (LSP) into freight contrib #3590

Closed
wants to merge 1,617 commits into from

Conversation

kt86
Copy link
Contributor

@kt86 kt86 commented Nov 26, 2024

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.

kt86 and others added 30 commits July 8, 2024 15:32
…he vehicleType is added from the vehicle's information when "addVehicle" is called ; shorten some builder patterns
Add an integration test and some refactoring
kt86 and others added 21 commits November 12, 2024 23:50
…g.matsim-matsim-all-2025.0-2024w46

Bump org.matsim:matsim-all from 2025.0-2024w42 to 2025.0-2024w46
…nalysis

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
@JWJoubert
Copy link
Contributor

This has been a lot of effort, @kt86 - well done!!

@kt86
Copy link
Contributor Author

kt86 commented Nov 27, 2024

Currently it has issues in finding scenarios/logistics-2regions/2regions-network.xml in the MATSim examples:
Caused by: java.io.FileNotFoundException: /home/runner/.m2/repository/org/matsim/matsim-examples/2025.0-SNAPSHOT/matsim-examples-2025.0-SNAPSHOT.jar!/test/scenarios/logistics-2regions/2regions-network.xml (No such file or directory)
(https://github.com/matsim-org/matsim-libs/actions/runs/12037626348/job/33594491228)
Locally it runs well, here not.

What I have done so far:

@kt86
Copy link
Contributor Author

kt86 commented Nov 27, 2024

Du to the issue with excessing the data, I created a new, clean PR, where I still use the scenario in the contrib. -> #3602

@kt86 kt86 closed this Nov 27, 2024
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