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

Integrate "demand generation of parcel delivery" (based on master thesis) in matsim-libs #3665

Merged
merged 53 commits into from
Jan 20, 2025

Conversation

AnaUeb
Copy link
Contributor

@AnaUeb AnaUeb commented Jan 14, 2025

As part of my master's thesis at VSP Berlin, I extended the existing Freight Demand Generation Tool to realistically generate and distribute parcel demand based on the MATSim plans files. It is possible to generate the demand based on the number of average daily parcels per person and to distribute the parcels taking into account the age structure of the population and based on a Poisson distribution.

The master's thesis was supervised by Prof. Dr. Kai Nagel, Kai Martins-Turner and Ricardo Ewert (TU Berlin).

rewertvsp and others added 14 commits January 7, 2025 14:29
…teAna2-by-Ricardo

# Conflicts:
#	contribs/application/src/main/java/org/matsim/freightDemandGeneration/DemandReaderFromCSV.java
#	contribs/application/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGeneration.java
#	contribs/application/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGenerationUtils.java
#	contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarrierLoadAnalysis.java
#	contribs/freight/src/main/java/org/matsim/freight/carriers/jsprit/DistanceConstraint.java
#	contribs/freight/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runServiceEventTest/Load_perVehicle.tsv
#	contribs/freight/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runShipmentEventTest/Load_perVehicle.tsv
Changes of Ricardo for integrating in matsim-libs
@AnaUeb
Copy link
Contributor Author

AnaUeb commented Jan 14, 2025

The pull request is made in agreement with Ricardo Ewert and Kai Martins-Turner.

@kt86 kt86 requested review from kt86 and rewertvsp January 14, 2025 18:10
@kt86 kt86 marked this pull request as draft January 14, 2025 18:10
# Conflicts:
#	contribs/application/src/main/java/org/matsim/freightDemandGeneration/DemandReaderFromCSV.java
@rewertvsp
Copy link
Contributor

General changes for the tool:

  • rename interface from JobDurationCalculator to DemandGenerationSpecification
  • add methods for demand generation to this interface
  • for the selection of next job locations, the person being related to a link is also part of the return object (now new Object LinkPersonPair)

Changes for integrating part for parcel VRP compared to the code of @AnaUeb:

  • move all relevant part to an implementation of the Interface DemandGenerationSpecification (including the added parameters)
  • remove some unnecessary implementations (e.g. person selection (this was already implemented)
  • update java language (e.g. for the writer)
  • no changes for the population, because this creates bug for the tool (use the existing element of possiblePersons)
  • try to use standardized objects instead of unclear HashMap structure (e.g. for the propabilities)
  • update output files (including hopefully a little bit more clear headers)
  • rebase Tests

rewertvsp and others added 6 commits January 15, 2025 13:53
# Conflicts:
#	contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java
# Conflicts:
#	contribs/application/src/main/java/org/matsim/freightDemandGeneration/CarrierReaderFromCSV.java
* revert changes in some poms

* remove input files.

They are now located in the zeroCUTS repo.

* re-add codeql.yml
Seems like it was accidentally removed
@kt86 kt86 marked this pull request as ready for review January 20, 2025 13:52
@rewertvsp rewertvsp merged commit da084ab into matsim-org:master Jan 20, 2025
47 checks passed
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