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

Consolidate dvrp/drt/taxi zones #3224

Merged
merged 20 commits into from
Apr 30, 2024
Merged

Conversation

nkuehnel
Copy link
Member

@nkuehnel nkuehnel commented Apr 19, 2024

This PR consolidates dvrp and drt zones and makes zones available in the "commons" contrib.

It's definitely a breaking change.

Zone systems can be defined through zone system params (currently defined for square grid, gis input files and h3 grid). These zone system params can be used at different places. For example, DvrpTravelTimeMatrixParams and DrtZonalSystemParams both have a pointer to the same definition of ZoneSystemParams.

Some regression tests had to be updated, as the creation of square grid in dvrp and drt were slightly different.

It turned out to be more extensive then initially estimated, happy for comments and reviews.

It's now possible to have individual zone systems and sizes for dvrp travel time matrices which might come handy in large simulations with different reuirements of spatial accuracy.

Copy link
Contributor

@sebhoerl sebhoerl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Nico, I quickly looked through it. Looks good from my side. It's a pity that some of the integration tests needed to be updated, but it's probably even better that this is uniform now. When I have the time, I will maybe implement a proper Euclidean hexagon grid ;-)

@nkuehnel
Copy link
Member Author

Tests run through on my local machine but some regression tests in the taxi contrib are still failing here. If anyone knows what the issue could be I would be glad for any support.

@steffenaxer
Copy link
Collaborator

steffenaxer commented Apr 28, 2024

Tested it on my mac m1. It runs on my machine. The test seems to fail in PopulationUtils.comparePopulations(expected, actual) with a different result.

Copy link
Member

@michalmac michalmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice big refactoring!

@nkuehnel nkuehnel merged commit 65b49fb into matsim-org:master Apr 30, 2024
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.

4 participants