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

Update MATSim CW33 #109

Merged
merged 298 commits into from
Aug 13, 2024
Merged

Update MATSim CW33 #109

merged 298 commits into from
Aug 13, 2024

Conversation

nkuehnel
Copy link
Member

  • Score explanation functionality
  • copy analysis code from matsim-kelheim to application contrib
  • rename a method from add... to set... since that is what is does.
  • changes
  • update config group
  • update tests and added attributes
  • fix un initialized attribute
  • small improvement to object creation
  • add leg score for individual legs
  • more consistent naming
  • more consistent naming
  • revert unintentional changes
  • CreateDrtDashboard
  • Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.3.0
  • rename pooling ratio to occupancy rate
  • account for group bookings in DrtAnalysisPostProcessing (and thus DrtDashboard)
  • typo in CreateDrtDashboard
  • fix wrong sum calculation
  • debug NoiseAnalysis and proper testing in NoiseDashboardTests
  • fix wrong map selection
  • add reduction of numberOfJobs
  • add comments and format log massages
  • combine
  • rename parameter
  • reduce code
  • format logging
  • use method for demand calculating
  • use method for shipment creation
  • remove todo
  • use method to calculate demand based on link lengths
  • introduce parameter
  • simplify
  • cleanup
  • Support TransitRouteStops where boarding or alighting is not allowed
  • make drt shifts multi mode drt comatible
  • adjust shift efficiency tracker as well
  • Extended Trip analysis and dashboard (Extended Trip analysis and dashboard matsim-org/matsim-libs#3332)
  • Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0
  • Bump org.apache.maven.plugins:maven-surefire-report-plugin
  • Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2
  • Bump com.fasterxml.woodstox:woodstox-core from 6.6.2 to 7.0.0
  • Bump org.jfree:jfreechart from 1.5.4 to 1.5.5
  • make drt work with only custom constraints sets
  • add some logging to NetworkChangeEventsWriter
  • correct logging statement
  • add router binding for complex request unscheduling
  • use time as disutility
  • Bump junit.version from 5.10.2 to 5.10.3
  • *** repair wrong positioning of vehicles if linkSpeedCalculator returns speed larger than free speed * replace some (but not all) link.getAttributes()... by BicycleUtils.set/getXyz( link, ...) * bind BicycleConfigGroup explicitly in BicycleModule so that not materializing it before does not lead to a non-interpretable error message (stating that Scenario is not bound about 20 times although that is not the root of the problem) * possibly one or the other additional things**
  • norm subgroups to 1 (Norm mode shares in TripAnalysis matsim-org/matsim-libs#3346)
  • add tests for mode restriction
  • add test integration test case for complex unscheduler
  • Bump io.grpc:grpc-all from 1.64.0 to 1.65.0
  • add tests that depict the current behaviour
  • Bump com.google.protobuf:protobuf-java from 4.27.1 to 4.27.2
  • implement multiple mode test
  • Split CalculateSkimMatrices.prepareAndCalculateNetworkMatrices() to allow for custom travel times objects
  • implement option for network inconsistency check; no test adaptation so far
  • Bump org.checkerframework:checker-qual from 3.44.0 to 3.45.0
  • implemented network changer
  • implement functionality in Util classes and moved config
  • implement test using the new functionality for mode restriction
  • revert changing the default access egress type
  • Switch to DrtWithExtensionsConfigGroup
  • Bump org.apache.poi:poi-ooxml from 5.2.5 to 5.3.0
  • explicitly set access egress type
  • fix test failures in contribs
  • fix test failures in contribs and add config parameter so relevant functions
  • reworked CreatePseudoNetwork with loop-links to avoid duplicating stops
  • repair test failures
  • Trip facet dashboard (Trip facet dashboard matsim-org/matsim-libs#3350)
  • adjust rounding
  • exclude case
  • Drt dashboard typo fix (Drt dashboard typo fix matsim-org/matsim-libs#3360)
  • Bump com.fasterxml.jackson:jackson-bom from 2.17.1 to 2.17.2
  • Bump net.bytebuddy:byte-buddy from 1.14.17 to 1.14.18
  • set networkMode based on vehicleTypes
  • pass lambda function as parameter
  • Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
  • chore: clean up MinimalTransferTimes (chore: clean up MinimalTransferTimes matsim-org/matsim-libs#3365)
  • chore: cleanup adaptive transfers (chore: cleanup adaptive transfers matsim-org/matsim-libs#3366)
  • Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.0 to 3.3.1
  • add missing case of enum
  • add functionality to split jobs
  • use new methods
  • update activity creation
  • set activity time correctly
  • remove unneeded exception
  • change to parameterized log message
  • delete empty test methods
  • remove unused import
  • fix unchecked assignment
  • remove redundant local variables
  • minor code style update
  • remove not needed throw information
  • make things final
  • remove redundant final declaration
  • remove unnecessary 'throws' declarations
  • simplify assertions
  • cleanup Strings
  • remove redundant casts
  • code style update
  • cleanup imports
  • Java language: Replace explicit type with <>
  • Java language: use computeIfAbsent
  • Java language: use Double.hashCode(...)
  • Java language: replace if by switch
  • Java language: avoid raw use
  • Java language: use text block
  • Java language: use pattern variable
  • Java language: use add/getFirst()
  • Access to TestUtils.EPSILION
  • add not null assertion
  • remove one layer of "LSPs"
  • add prebooking support for drt shifts some minor shift cleanups possibility to assign requests to shifts that are assigned bot not started yet
  • cancel assigned shifts
  • Bump com.google.errorprone:error_prone_annotations from 2.28.0 to 2.29.2
  • add some documentation
  • shift drt maintenance
  • some more drt shift maintenance
  • consider break corridors for (pre)bookings
  • consider break corridors for (pre)bookings
  • clean up obsolete method
  • update FISS test, reduce iterations to reduce runtime
  • avoid abandoning prebooked requests twice in the same time step
  • fix tests by disabling net consistency check
  • adapt error messages
  • remove redundant suppression
  • remove unused field
  • internal renaming
  • remove unnecessary toString() calls
  • remove unnecessary semicolon
  • inline and remove method
  • cleanup imports
  • simplification
  • make final, internal renaming
  • replace 'if' by 'switch'
  • simplification
  • use enhanced 'switch'
  • simplification
  • use 'getFirst()'
  • javadoc: replace blank lines with '

    '

  • javadoc: set link as a link
  • logging: use parameterized logging
  • add casting
  • simplification
  • use 'append()' calls
  • simplification by removing inaccessibly parts of if statements.
  • remove duplicated setting of variable
  • Simplify assertions
  • Simplify stream
  • avoid casting
  • suppress warning
  • fix some (language) grammar
  • fix some typos
  • more simplifications
  • cleanup: remove commented out code
  • small cleanups
  • fix test failures by disable net consistency check
  • optimize h3 zone system initialization; move h3 test to common module
  • shift drt maintenance; fix bug for prebooked e-drt scenarios that need shifts to be assignable to requests in advance; change priority queues in shift dispatcher to sorted sets to ensure correct iteration order
  • make FISS integration test less sensible to smaller changes in link events
  • set level of some logging's back from WARN to DEBUG
  • SimWrapper Dashboard features (SimWrapper Dashboard features matsim-org/matsim-libs#3381)
  • Update GenerateFreightPlans.java (Update GenerateFreightPlans.java matsim-org/matsim-libs#3387)
  • add events files comparison
  • more (javadoc) comments
  • add test which includes tolling. One test is failing, because it is not possible to create different schemes for the different types.
  • WIP: Prepare test for tolling with factor. Not implemented to the end now -> Disabled.
  • replace self-build RoadPricingCalculator with official RoadPricingScheme
  • adapt test: use tollFactor
  • add option if person==null
  • more tests
  • more steps forward
  • fix one test: Use MATSim's vehicles
  • fix the last test: Building the netbased costs without MATSim's vehicle types
  • some cleanup and javadoc
  • fix typos, internal renaming
  • Bump org.apache.maven.plugins:maven-surefire-report-plugin
  • Bump io.grpc:grpc-all from 1.65.0 to 1.65.1
  • Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1
  • Bump commons-codec:commons-codec from 1.17.0 to 1.17.1
  • Preserve the working directory when gui is run from cli (Preserve the working directory when gui is run from cli matsim-org/matsim-libs#3391)
  • use asterisk for act type default
  • NoiseAnalysis: set the scale factor for according to sample size
  • add fare zone based pt pricing (add fare zone based pt pricing matsim-org/matsim-libs#3382)
  • better defaults for NoiseDashboard
  • remove the static
  • NoiseAnalysis: more explicit parameter settings + bug fix in MergeNoiseOutput
  • Update DRT estimate and teleport module (Update DRT estimate and teleport module matsim-org/matsim-libs#3333)
  • NoiseAnalysis: merge damages files
  • NoiseDashboard: include stats and damage plots
  • only perform net consistency check once
  • CreateSingleSimWrapperDashboard
  • fix noise tests: explicitly set activity types for rp grid, when setting act type for damage calculation
  • fix nasty insertion scheduler bug

nkuehnel and others added 30 commits June 23, 2024 22:52
Make drt shifts multi mode drt compatible
* trip analysis for subgroups

* refactor categories

* write trip analysis

* write out correct table

* use static method

* prepare for facets, add TODOs

* start working on plotly facet integration

* Added Test Trip Dashboard for Facets

* update API

* add trip choice analysis

* adding test case and some todos

* calculating some trip choice metrics

* add choice metrics to trip dashboard

* hide tab if not needed

* add text box and round metrics

* normalize shares per reference group correctly, added some facet dashboards (WIP)

* fix pivot usage

* rename entries

* add plots for distance distributions

* add todo

* use dropdown for plots

* add cohen kappa to evaluation

* output euclidean distance for trip choices

* add ref_id attribute

* added heatmap to TripDashboard

* update description

* allow arbitrary object for ref ids

* show heatmap labels

* comment out trip dashboard wip part

* use correct logger

* improve wording

---------

Co-authored-by: frievoe97 <[email protected]>
…rg.apache.maven.plugins-maven-failsafe-plugin-3.3.0

Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.3.0
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…rg.apache.maven.plugins-maven-surefire-plugin-3.3.0

Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0
Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.4.1...maven-jar-plugin-3.4.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…rg.apache.maven.plugins-maven-surefire-report-plugin-3.3.0

Bump org.apache.maven.plugins:maven-surefire-report-plugin from 3.2.5 to 3.3.0
…rg.apache.maven.plugins-maven-jar-plugin-3.4.2

Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2
Bumps [com.fasterxml.woodstox:woodstox-core](https://github.com/FasterXML/woodstox) from 6.6.2 to 7.0.0.
- [Commits](FasterXML/woodstox@woodstox-core-6.6.2...woodstox-core-7.0.0)

---
updated-dependencies:
- dependency-name: com.fasterxml.woodstox:woodstox-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [org.jfree:jfreechart](https://github.com/jfree/jfreechart) from 1.5.4 to 1.5.5.
- [Release notes](https://github.com/jfree/jfreechart/releases)
- [Commits](jfree/jfreechart@v1.5.4...v1.5.5)

---
updated-dependencies:
- dependency-name: org.jfree:jfreechart
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…rg.jfree-jfreechart-1.5.5

Bump org.jfree:jfreechart from 1.5.4 to 1.5.5
…om.fasterxml.woodstox-woodstox-core-7.0.0

Bump com.fasterxml.woodstox:woodstox-core from 6.6.2 to 7.0.0
rename a method from add... to set... since that is what is does.
…rk-change-events-writer

Add logging to network change events writer
jfbischoff and others added 23 commits August 6, 2024 16:23
…ommons-codec-commons-codec-1.17.1

Bump commons-codec:commons-codec from 1.17.0 to 1.17.1
NoiseAnalysis: use asterisk for act type default
NoiseAnalysis: set the scale factor for according to sample size
* first try to implement fare zone based pt pricing, deutschlandtarif numbers still missing

* put deutschlandtarif price linear functions into code

* unit test for FareZoneBasedPtFareHandler
…terForSmallScaleCommercial

remove static for constructor values
Re-organizing the DRT estimation scripts. For more details, please see detailed description above.
…pdate

move network consistency check to PrepareForSimImpl
fix DRT: insertion scheduler bug in prebooking scenarios
@nkuehnel nkuehnel merged commit 93b4961 into moia-deployment Aug 13, 2024
@nkuehnel nkuehnel deleted the cw33 branch August 13, 2024 09:52
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.