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

Merge develop into main #118

Merged
merged 57 commits into from
Aug 13, 2024
Merged

Merge develop into main #118

merged 57 commits into from
Aug 13, 2024

Conversation

jakobrehmann
Copy link
Collaborator

No description provided.

jakobrehmann and others added 30 commits October 7, 2022 15:44
…imulation of first wave with no outdoor leisure activities
… to be); the name change caused an incompatibility w/ covid-sim.
jakobrehmann and others added 27 commits October 26, 2023 14:30
…10-XX

# Conflicts:
#	src/main/java/org/matsim/episim/analysis/HospitalNumbersFromEvents.java
…t processing 2023-11-06/1-bmbf-calibrate-eg = 2023-11-06/1-bmbf-calibrate-eg-B
add empty line to trigger build
# Conflicts:
#	src/main/java/org/matsim/episim/analysis/HospitalNumbersFromEvents.java
#	src/main/java/org/matsim/episim/model/InfectionModelWithAntibodies.java
#	src/main/java/org/matsim/episim/model/VirusStrain.java
#	src/main/java/org/matsim/episim/model/progression/AntibodyDependentTransitionModel.java
#	src/main/java/org/matsim/run/CreateBatteryForCluster.java
…urary and October BMBF reports (BQ_1_1 -> BQ & XBB_1_5 -> XBB_15).
added boiler plate batch classes for episim workshop
@rakow rakow merged commit 760cf99 into master Aug 13, 2024
5 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.

6 participants