Skip to content

Conversation

@jakobrehmann
Copy link
Collaborator

Major updates include (but are not limited to):

  • update to java 21
  • update to MATSim 2025
  • addition of Health Extension and various modules related to Manchester Scenario
  • Solving of Determinism problem in SiloMuc.

Qinnnnn and others added 30 commits October 28, 2020 13:37
Fix the errors corresponding to the new matsim version
Fix the errors corresponding to the new matsim version
# Conflicts:
#	analysis/pom.xml
#	extensions/matsim2silo/pom.xml
#	extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimData.java
#	extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimSkimCreator.java
#	extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimTransportModel.java
#	extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimTravelTimesAndCosts.java
#	extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/accessibility/AccessibilityModule.java
#	extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/accessibility/MatsimAccessibility.java
#	extensions/pom.xml
#	siloCore/pom.xml
#	siloCore/src/main/java/de/tum/bgu/msm/utils/SiloUtil.java
#	synthetic-population/pom.xml
#	useCases/munich/src/test/java/de/tum/bgu/msm/transportModel/matsim/SBBTest.java
#	useCases/pom.xml
…msmobility/silo into transportHealthIntegrationModel

� Conflicts:
�	useCases/munich/src/main/java/de/tum/bgu/msm/scenarios/health/HealthModel.java
…l' into transportHealthIntegrationModel

# Conflicts:
#	useCases/munich/src/main/java/de/tum/bgu/msm/scenarios/health/HealthModel.java
Qinnnnn and others added 27 commits March 20, 2025 23:45
1) add ap concentration from bus vehicles
2) implement ap exposure and physical activity of PT trips
…he use case Munich to SILO core (new Java is not support the transfer engine between Java code and Java scripts)
…he use case Munich to SILO core (new Java is not support the transfer engine between Java code and Java scripts)
…he use case Munich to SILO core (new Java is not support the transfer engine between Java code and Java scripts)
…s://github.com/msmobility/silo into transportHealthIntegrationModel_jibe_baustelle

# Conflicts:
#	siloCore/src/main/java/de/tum/bgu/msm/data/household/IncomeAdjustment.java
…el_jibe_baustelle

Solved Determinism Problem + Added BerlinBrandenburg Boilerplate Scenario
@jakobrehmann jakobrehmann merged commit 8f03e4c into master Jul 31, 2025
2 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