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

Develop - merge to master for new release (0.5.0) #98

Merged
merged 200 commits into from
Jul 14, 2023
Merged

Conversation

MarkRaadsen
Copy link
Member

No description provided.

MarkRaadsen and others added 30 commits November 10, 2021 20:22
…PASs when not used, updating bush tun flows during loading update)

- added test with consecutive PASs single od (working)
- added test with multiple destinations (not working yet, continue with this)
… the wrong way around. This is fixed

- bug fix sLTM: when between iterations a node switches from potentially blocking to non-blocking, its costs must be updated. This was not the case due to its now non-blocking nature. This is now fixed.
- bug fix: sLTM: outflows are now updated on all tracked node incoming link segments, this was not the case.
- added multi-destination test with assertions that fail due to incorrect tracking of bush splitting rates under multiple destinations. To be fixed
- added warning to steady state travel time cost in case outflow is zero and inflow is positive
…not potentially blocking, the node model was still run. This has been fixed

- enhancement sLTM: storing of turn sending flows now by multikey rather than manual combined hash. This is safer
…litting rates per bush. Continue with flow shift implementation based on identified labelling, then continue with loading update which should track sending flows per label to correctly determine splitting rates per label as well
…h based added. NOT TESTED. We track flows per bush per label where labels are created such that at merges flow are tracked separately such that when diverging the flows are split by label instead of across all flow. This means that flow originating from a different location before the merge can be impeded differently and the diverge would be able to recognise this as flow is stored separately. Without this labelling this would not be possible. It effectively is a smarter way of storing destination based information in the bush
- removed manual combinedhashkeys as map key with multikeymaps from apache commons instead
…compute proportions for the PAS diverge differently. Before these proportions were not yet calculated at all. Now this is added, but not yet tested.
…t code using vars as well. Odtest1 now working again. Continue with SingleOdtest2.
…eod2 test is just rounding? Check and fix then move on with multi-od
- updated odtest2 for sLTM. Now passing.
- added test for multi-od bush-based sLTM
- multi-(o)d bush based tests now succeeding and assertions added
…ion to be more generic (not done)

- shortest bush to be used in sLTM bush-based
- added grid network generator
- added grid based bush sLTM test (not done)
- support for destination labelled bushes. This is the simple labelling mechanism that in due time is to be replaced by more intelligent labelling
- destination labelled bushes tests for single or and multi destination work and succeed, multi-origin and grid-based tests need to be developed further
- smart labelling prototype is partly implemented in the form of smartLabelling flow shift executor. To be expanded on in the future (created separate issue for this)
@MarkRaadsen MarkRaadsen self-assigned this Jul 14, 2023
@MarkRaadsen MarkRaadsen merged commit bb38dab into master Jul 14, 2023
@MarkRaadsen MarkRaadsen changed the title Develop - merge to master for new release (0.4.0) Develop - merge to master for new release (0.5.0) Feb 8, 2024
MarkRaadsen added a commit that referenced this pull request Jul 21, 2024
…to make consolidation in single file possible in a nice way. not done yet.

- added option to planit output formatter flag to signal this (does not do anything yet)
- continue with refactoring writing csvs to be able to feed in file name based on iteration inclusion or not, adding in writing to file or string and to choose whether a header is to be included or not (when consolidating, only the initial header is to be included, not subsequent ones)
- then for simulation data print to string with single header, track in list per iteration and then print final result in one go using the same general approach
MarkRaadsen pushed a commit that referenced this pull request Jul 26, 2024
… a 500 iteration route choice test in PLANitIO so it is part of CI (only tested for PLANit output format, no other output formats)
@MarkRaadsen MarkRaadsen linked an issue Aug 15, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment