Moved simClock increment; implemented random.choices(). Refactored vaccine protection

daveselinger / covid_rapid_test_simulation2

An update to our original rapid test simulation.

MIT License

0 stars 1 forks source link

Moved simClock increment; implemented random.choices(). Refactored vaccine protection #19

Closed tedkyi closed 2 years ago

tedkyi commented 2 years ago

Quick commit that makes two small changes Roger and I discussed:

Moved the increment of simClock to the beginning of tick()
Changed the initialization of variants to use random.choices()

tedkyi commented 2 years ago

Second commit has the new vaccination code:

Vaccine protection is now a float for each actor; got rid of booleans
There is a spot to calculate the waning protection based on how many days since vaccination TODO: Someone needs to put in a reasonable curve for waning protection

tedkyi commented 2 years ago

Third commit has reinfections that work similar to vaccinations, as a multiplicative float:

Recovered resistance is based on prior variant(s) and new variant
If multiple prior, currently takes the max
There is a spot to calculate the waning protection based on how many days since infection TODO: Someone needs to put in a reasonable curve for waning protection

rstager commented 2 years ago

Ted, I think simulation.py:181 (recovered resistance) is redundant with line 128. I will merge and we can clean up on main branch.

tedkyi commented 2 years ago

@rstager, thanks for reviewing. The way the VariantParameters class works is that it defines default values. Initially all variants have the same values. The stuff near line 128 is where SimulationParameters.__init__() overrides these defaults and sets different values for certain parameters for certain variants. So yes, it does set the same parameters, but it's on purpose as an example how to have different values for different variants.