Code

660 compare IDE and ODE models#672

Code

Draft

annawendler wants to merge 141 commits intomainSciCompMod/memilio:mainfrom 660-compare-ide-and-ode-modelsSciCompMod/memilio:660-compare-ide-and-ode-modelsCopy head branch name to clipboard

+1,768-37

Commits

Commits on Nov 21, 2022

• Add files

  

  Wendler

  committed
  7da18d5

Commits on Nov 28, 2022

• completed setup

  lenaploetzke

  committed
  1e9971e

• added first ideas for IDE-SECIR-model

  lenaploetzke

  committed
  341d50f

Commits on Dec 2, 2022

• Little changes

  

  Wendler

  committed
  418b38e

Commits on Dec 5, 2022

• implemented some of the necessary simulation functions

  lenaploetzke

  committed
  483984c

Commits on Dec 7, 2022

• Add function and example

  

  Wendler

  committed
  04abd2f

Commits on Dec 9, 2022

• Change name: IdeSeirModel -> Model

  

  Wendler

  committed
  7e84de9

• Try example

  annawendler

  committed
  a9a7b03

• Merge branch 'main' into 378-implement-ide-model-with-more-compartments

  mknaranja

  committed
  9922053

Commits on Dec 12, 2022

• added Deaths etc

  lenaploetzke

  committed
  9b736e2

Commits on Dec 13, 2022

• Example is running now

  annawendler

  committed
  a31ef6b

Commits on Dec 16, 2022

• Test example

  annawendler

  committed
  731edc3

Commits on Dec 19, 2022

• Correct code

  annawendler

  committed
  f7183e3

Commits on Dec 20, 2022

• Change order in simulate and infection age in compute_flow

  annawendler

  committed
  3138206

• Convert from index to infection age

  annawendler

  committed
  35c02b4

• InfectionTransitionsMap

  mknaranja

  committed
  ebb0be4

• Use infection age instead of get_time()

  annawendler

  committed
  bf93ce7

Commits on Jan 2, 2023

• small bug fixes and cleaning up

  lenaploetzke

  committed
  295f990

• added transitions to Recovered

  lenaploetzke

  committed
  7667fe7

Commits on Jan 9, 2023

• Minor changes

  annawendler

  committed
  27a1601

Commits on Jan 12, 2023

• Add dependence of infection_age to TransmissionProbabilityOnContact

  annawendler

  committed
  4838073

• Merge branch '521-extend-parameters' of https://github.com/DLR-SC/memilio into 521-extend-parameters

  annawendler

  committed
  bd3ce7a

Commits on Jan 13, 2023

• Template for parameter functions

  annawendler

  committed
  5e24d9b

Commits on Jan 16, 2023

• Remove some comments

  annawendler

  committed
  1503dcc

• Remove some comments2

  annawendler

  committed
  abff57a

• corrected probability in get_size_compartments

  lenaploetzke

  committed
  0c26e4d

• add a documentation

  lenaploetzke

  committed
  1f5ca3b

• added std::move() to parameters

  lenaploetzke

  committed
  3053b41

Commits on Jan 17, 2023

• Default parameters can be used now; remove TODOs

  annawendler

  committed
  be58959

• Change type of tmax, N, Dead0 and dt to ScalarType

  annawendler

  committed
  ccc40c6

Commits on Jan 23, 2023

• Not working: test_ide_secir.cpp

  annawendler

  committed
  29bd745

Commits on Feb 6, 2023

• Make const& for parameters

  annawendler

  committed
  d459220

• test is now working

  lenaploetzke

  committed
  ae787fa

Commits on Feb 10, 2023

• Some changes and error in test

  annawendler

  committed
  bacae1c

Commits on Feb 13, 2023

• Resolved error in test and some documentation

  lenaploetzke

  committed
  f39a318

• add system test

  lenaploetzke

  committed
  9fb34b3

• added test for transitions

  lenaploetzke

  committed
  d0d38f7

• move initialization so that no faults occur

  lenaploetzke

  committed
  7a20f04

Commits on Feb 24, 2023

• Correct simulation functions and add test

  annawendler

  committed
  60caf9d

Commits on Feb 27, 2023

• change documentation, Dead0, calculation of forceofinfection

  lenaploetzke

  committed
  f267030

• deleted temporary dummy file, not needed

  lenaploetzke

  authored
  5cd738b

• delete dt sometimes (is included in transitions)

  lenaploetzke

  committed
  aacfa2f

Commits on Mar 3, 2023

• Adjust formulas for flows wrt to dt

  annawendler

  committed
  e991c37

Commits on Mar 6, 2023

• Adjust calc_time_index in compute_flow

  annawendler

  committed
  e6538c3

• Merge branch '378-implement-ide-model-with-more-compartments' into 588-exponential-distribution-in-transitiondistribution

  annawendler

  committed
  4ca0b70

• Not working: first ideas to implement exp distr

  annawendler

  committed
  34d513d

Commits on Mar 9, 2023

• Update documentation and add README

  annawendler

  committed
  b1cfecd

• included tests; fixed some typos

  lenaploetzke

  committed
  3c26770

Commits on Mar 14, 2023

• Creating Simulation class for IDE Secir and small adjustments here and there

  mknaranja

  committed
  67894fc

Commits on Mar 16, 2023

• implemented suggested changes and small other fixes

  Show description for dd8ca56
  

  lenaploetzke

  and

  annawendler

  committed
  dd8ca56

• Add constraints to check_constraints

  annawendler

  committed
  e7abe4f

• Add constraints to check constraints Co-authored-by: Lena Plötzke <[email protected]>

  annawendler

  committed
  6870987

• Merge branch '378-implement-ide-model-with-more-compartments' of https://github.com/DLR-SC/memilio into 378-implement-ide-model-with-more-compartments

  annawendler

  committed
  7be0fbc

Commits on Mar 17, 2023

• Set m_max_support from outside, test for influence

  Show description for 551789e
  annawendler

  committed
  551789e

• Small change in test

  annawendler

  committed
  e3a04dc

• Add test for proportion between R and D

  Show description for 6948af0
  annawendler

  committed
  6948af0

Commits on Mar 27, 2023

• Rework initalization, separate tests + small

  Show description for 2553d41
  

  annawendler

  and

  lenaploetzke

  committed
  2553d41

Commits on Apr 5, 2023

• Sort functions in model.cpp and model.h

  annawendler

  committed
  44d401c

• Extend check_constraints()

  annawendler

  committed
  c4ad763

Commits on Apr 17, 2023

• fix build error

  annawendler

  committed
  9b58470

Commits on Apr 18, 2023

• merge

  annawendler

  committed
  3975cd5

• fix merging mistakes

  lenaploetzke

  committed
  bc313d2

Commits on Apr 20, 2023

• merge main into branch

  Show description for 2d49f80
  

  annawendler

  and

  lenaploetzke

  committed
  2d49f80

• idea for generalization, not working yet

  lenaploetzke

  committed
  98bc4b7

Commits on Apr 22, 2023

• less errors

  annawendler

  committed
  aa3fa4d

Commits on Apr 25, 2023

• building now

  annawendler

  committed
  b8713b6

Commits on May 3, 2023

• can (in theory) set stateagefunction and funcapram

  Show description for f01dfef
  annawendler

  committed
  f01dfef

Commits on May 11, 2023

• running now

  annawendler

  committed
  187d66b

• adapt tests

  annawendler

  committed
  de02cfb

Commits on May 15, 2023

• remove nnecessary functions

  annawendler

  committed
  794609b

• add documentation

  annawendler

  committed
  3011083

Commits on May 16, 2023

• adapt check constraints, StateAgeFunction not

  Show description for 1d4adcb
  annawendler

  committed
  1d4adcb

Commits on May 22, 2023

• add virtual destructor and special member funcs

  annawendler

  committed
  14aca3a

• merge branch 521 (state age dependent parameters)

  annawendler

  committed
  4f44af1

• Use StateAgeFunctionWrapper instead of

  Show description for 1a41053
  annawendler

  committed
  1a41053

• basic version of get_max_support

  annawendler

  committed
  1972374

Commits on May 30, 2023

• Make Function in StateAgeFunction pure virtual

  annawendler

  committed
  f9beba8

Commits on Jun 2, 2023

• add test for safwrapper

  annawendler

  committed
  294e8f2

• small stuff

  annawendler

  committed
  ba6b394

• merge 521 into this branch

  annawendler

  committed
  8014532

Commits on Jun 5, 2023

• Merge 588-exponential-distribution-in-transitiondistribution

  annawendler

  committed
  fd0df5e

Commits on Jun 9, 2023

• compute inital flows from compartments;

  Show description for 164beb9
  annawendler

  committed
  164beb9

• working now

  annawendler

  committed
  5b26b72

Commits on Jun 15, 2023

• eval instead of Function

  annawendler

  committed
  b8e4b3a

• Merge 521 and adapt accordingly

  annawendler

  committed
  fa3a41d

Commits on Jun 16, 2023

• try out stuff

  annawendler

  committed
  f43d9bf

• Merge branch '588-exponential-distribution-in-transitiondistribution' into 660-compare-ide-and-ode-models

  annawendler

  committed
  4cc4c6f

Commits on Jun 28, 2023

• some changes

  annawendler

  committed
  50e2d8e

Commits on Jul 17, 2023

• current status

  annawendler

  committed
  5ac75ab

Commits on Aug 7, 2023

• update support_max after setting a new parameter

  annawendler

  committed
  ada724a

• add test

  annawendler

  committed
  f7e541c

Commits on Aug 8, 2023

• remove print

  annawendler

  committed
  e954560

• correct formula

  annawendler

  committed
  95e7930

Commits on Aug 10, 2023

• Merge branch 'main' into 660-compare-ide-and-ode-models

  annawendler

  committed
  6357fc7

• Merge branch '723-compute-support_max-after-setting-new-parameter-in-stateagefunction' into 660-compare-ide-and-ode-models

  annawendler

  committed
  20aaf39

• Merge branch '725-correction-of-formula-for-susceptibles-in-initialization' into 660-compare-ide-and-ode-models

  annawendler

  committed
  bc2cf0b

Commits on Aug 18, 2023

• Merge branch 'main' into 660-compare-ide-and-ode-models

  annawendler

  committed
  875eef7

• Merge branch 'main' into 660-compare-ide-and-ode-models

  annawendler

  committed
  6344fa7

Commits on Aug 21, 2023

• test is running now; rename files for debugging

  annawendler

  committed
  6b0bf0d

• correct times in time series now

  annawendler

  committed
  c9035d9

Commits on Aug 25, 2023

• Correct rates in TransitionDistributions, set SECIHUR0

  Show description for 7c438a5
  annawendler

  committed
  7c438a5

Commits on Sep 11, 2023

• adjust example, compute order of convergence

  annawendler

  committed
  fca50c8

Commits on Oct 30, 2023

• clean up

  annawendler

  committed
  6062b7c

Commits on Jan 26, 2024

• convergence plots for all compartments

  annawendler

  committed
  33157b0

Commits on Feb 16, 2024

• more flexible handling of numerical experiments

  annawendler

  committed
  f6c53af

Commits on Feb 21, 2024

• minor update of numerical experiments

  annawendler

  committed
  98c24e8

Commits on Feb 22, 2024

• adapt computation of flows from ode and small changes

  annawendler

  committed
  5076119

Commits on Feb 23, 2024

• clean up

  annawendler

  committed
  f148d5e

• option for setting m_populations in cnstructor or initialize_solver

  annawendler

  committed
  b1c9f41

• Merge branch 'main' into 660-compare-ide-and-ode-models

  annawendler

  committed
  943fd6c

Commits on Feb 26, 2024

• adapt constructor

  annawendler

  committed
  79e787a

• go back to case distinction with need_flow_init

  annawendler

  committed
  b323fa0

Commits on Feb 29, 2024

• try different order in initialization and adjust accordingly

  annawendler

  committed
  7ffa592

Commits on Mar 19, 2024

• update settings

  annawendler

  committed
  d79e1f3

• Merge branch 'main' into 660-compare-ide-and-ode-models

  annawendler

  committed
  5625fa9

• Merge branch 'main' into 660-compare-ide-and-ode-models

  annawendler

  committed
  9e8bdb0

• Adjust to new parameters in ODE model

  annawendler

  committed
  b5be2ce

• correct reordering of initializations for solver

  annawendler

  committed
  c91a6c6

• Initialize all IDE timesteps based on same ODE model

  annawendler

  committed
  134912d

Commits on Mar 22, 2024

• Investigate convergence of flows

  annawendler

  committed
  16ccacb

Commits on Mar 26, 2024

• adjust initialize_from_ode

  annawendler

  committed
  c2c0d0d

• add documentation

  annawendler

  committed
  fc6d8c1

Commits on May 14, 2024

• change index

  annawendler

  committed
  3bf3a66

• merge main

  annawendler

  committed
  0813b38

• adjust to merge

  annawendler

  committed
  36051ca

• temporary fix

  annawendler

  committed
  0d2236a

• adjust filepaths

  annawendler

  committed
  b017124

Commits on May 16, 2024

• small adaptations

  annawendler

  committed
  a8f954b

Commits on May 21, 2024

• Merge main

  annawendler

  committed
  0a7a5ff

Commits on May 22, 2024

• adjust to main

  annawendler

  committed
  2cb68e2

Commits on May 31, 2024

• adjust plots

  annawendler

  committed
  28d22a9

Commits on Jul 11, 2024

• compute l2 norm for all compartments/flows

  annawendler

  committed
  60ab111

Commits on Jul 15, 2024

• remove additional settings from bug search

  annawendler

  committed
  753c336

Commits on Jul 24, 2024

• adjust convergence plots

  annawendler

  committed
  763bced

Commits on Jul 26, 2024

• Merge branch 'main' into 660-compare-ide-and-ode-models

  lenaploetzke

  committed
  6f7dc00

Commits on Jul 30, 2024

• clean up and relative norm

  lenaploetzke

  committed
  5301105

Commits on Jul 31, 2024

• formatting and relative norm

  lenaploetzke

  committed
  08d74f0

• make plots more beautiful

  lenaploetzke

  committed
  ddd13c5

• add r

  lenaploetzke

  committed
  f90f3f7

Commits on Aug 7, 2024

• adapt label

  lenaploetzke

  committed
  c630cd7

Commits on Aug 16, 2024

• adapt ylabel

  annawendler

  committed
  89bd4cf