pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1059 commits 24 branches 13 tags 17 MiB
Commit graph

168 commits

Author SHA1 Message Date
Nicolas Mounet
efe35da414 Taking the mean of the exposure only when diameter is an array (represents a distribution) 2021-09-16 18:15:25 +02:00
Nicolas Mounet
30eb90099b Introducing cn as parameter for the Expiration, and proper normalization of the exposure 2021-09-16 18:15:25 +02:00
Nicolas Mounet
acdd22cb07 Bugs fixed in monte_carlo/data.py; updating ExposureModel for diameter dependent exposure 2021-09-16 18:15:25 +02:00
Nicolas Mounet
7d3a83c629 Removing completely the previous BLO implementation for Expiration; tests updated accordingly 2021-09-16 18:09:35 +02:00
Nicolas Mounet
ab90b04349 Introducing diameter as a vectorised parameter of Expiration. Providing equivalent diameters for each expiration type (gives the same emission rate as before) 2021-09-16 17:48:49 +02:00
Nicolas Mounet
936c72f76c Adding optional total concentration parameter in Expiration 2021-09-16 17:22:32 +02:00
Nicolas Mounet
ca6e70f2f9 Removing completely the previous BLO implementation for Expiration; tests updated accordingly 2021-09-16 16:33:31 +02:00
Nicolas Mounet
85f0f1708e Removing infectious dose in emission rate when using known_individual_emission_rate 2021-09-16 16:33:31 +02:00
Nicolas Mounet
d1ec990255 Remove suprespreading event from the expiration types; replace by an optional parameter to fix directly the emission rate; updates the corresponding tests 2021-09-16 16:33:31 +02:00
Nicolas Mounet
46465c499d Vectorising the Mask exhale_efficiency method 2021-09-16 16:33:30 +02:00
Nicolas Mounet
83e2185763 Introducing diameter as a vectorised parameter of Expiration. Providing equivalent diameters for each expiration type (gives the same emission rate as before) 2021-09-16 14:41:06 +02:00
Nicolas Mounet
af3ded7935 Remove suprespreading event from the expiration types 2021-09-16 13:55:04 +02:00
Nicolas Mounet
92f9bce7e5 Normalization of the computation of the concentration 2021-09-14 16:11:44 +02:00
Nicolas Mounet
9ed65a2b04 Model optimisation: avoid computing before first presence time 2021-09-13 12:00:06 +02:00
Phil Elson
3206a069a0 After review under snakeviz, introduce some further caching for performance gains. 2021-08-06 15:32:01 +02:00
Phil Elson
f22ba928e0 Ensure that 0 is always one of the state change times. 2021-08-06 15:17:37 +02:00
Phil Elson
06b606f3fa Remove the unused _is_interval_between_state_changes method. 2021-08-06 11:57:00 +02:00
Phil Elson
0e71ace0d9 Implement bisection algorithm for finding the most recent state change. 2021-08-06 11:52:14 +02:00
Phil Elson
43b9b864af Improve the testing of ConcentrationModel.last_state_change 2021-08-06 11:52:14 +02:00
Phil Elson
9546c1966c Rename _concentration_at_state_change to _concentration_cached. 2021-08-06 11:50:06 +02:00
Phil Elson
aa269aaf6e Use floats throughout the cara codebase to represent time. 2021-08-06 10:39:41 +02:00
Luis Aleixo
acbf676a28 Remove the concept of quanta in the model, focusing instead on virons. 2021-08-06 08:24:25 +00:00
Andre Henriques
3f89657355 Add new virus type (indian variant) 2021-06-25 09:10:04 +00:00
Nicolas Mounet
17956d766d Reverting to a refinement factor of 4 in the time-dependence of Geneva temperature; optimizing the caching; decreasing the timeout value in tests 2021-06-05 18:38:57 +02:00
Nicolas Mounet
82667698d5 Adding comment to refer to CERN report for the gravitational settlement 2021-06-04 10:24:02 +02:00
Nicolas Mounet
4fe0fbefbe Modifying vg for gravitational settlement, to comply with the CERN note 2021-06-04 05:45:25 +02:00
Nicolas Mounet
02cbc2be30 Adding fraction_deposited to ExposureModel (vectorised); improving docstrings 2021-06-01 09:22:15 +02:00
Nicolas Mounet
390d229944 Caching aerosols computation 2021-05-31 23:23:42 +02:00
Nicolas Mounet
62a4880a5b Avoiding vectorisation of factor_exhale, and changing test_infected_population accordingly (incompatibility with scipy quad integration) 2021-05-31 17:12:18 +02:00
Nicolas Mounet
3a39043522 More accurate B, L and O modes; correcting units 2021-05-31 16:41:41 +02:00
Nicolas Mounet
d12e809d80 Better import of scipy.integrate 2021-05-31 11:29:49 +02:00
Nicolas Mounet
ecf9ce8655 Removing old Expiration class; replaced by previously named ExpirationBLO class 2021-05-31 11:08:42 +02:00
Nicolas Mounet
43cdb36a47 Merge branch 'feature/refined_mask_model' into feature/refined_expiration_model 2021-05-31 09:30:43 +02:00
Nicolas Mounet
a61e900178 Fixing docstring 2021-05-31 09:10:14 +02:00
Nicolas Mounet
be5aea72f0 Mask exhale_efficiency use now a diameter in microns 2021-05-31 09:10:14 +02:00
Nicolas Mounet
d5fb86d694 Removing _MaskBase and old Mask class, which is replaced by MeasuredMask 2021-05-31 09:10:14 +02:00
Nicolas Mounet
6fd8d6531b Fixing previous merge 2021-05-31 09:10:06 +02:00
Nicolas Mounet
de5e96fd0f Introducing _ExpirationBase and MultipleExpiration classes; adapting tests and model_generator accordingly (removing now obsolete expiration_blend function) 2021-05-28 17:43:06 +02:00
Nicolas Mounet
95640cb5be Modifying eta_inhale of Type I measured mask according to CERN report 2021-05-28 17:41:56 +02:00
Nicolas Mounet
4aa819bea4 Correction in docstring of _MaskBase 2021-05-28 17:41:56 +02:00
Nicolas Mounet
adc11cb527 New method inhale_efficiency in _MaskBase; using _MaskBase everywhere needed (also for types); new MeasuredMask with different exhale_efficiency functions; new mask types 2021-05-28 17:41:56 +02:00
Nicolas Mounet
9322c27af9 Introducing _MaskBase class, of which Mask is a subclass 2021-05-28 17:40:27 +02:00
Phil Elson
8ac3b4cbd9 Avoid the use of the updates from #184. 2021-05-28 10:50:33 +02:00
Nicolas Mounet
f050214237 Improving docstrings in expiration classes 2021-05-28 10:48:23 +02:00
Nicolas Mounet
b8422aaf1b Introducing _ExpirationBase and MultipleExpiration classes; adapting tests and model_generator accordingly (removing now obsolete expiration_blend function) 2021-05-28 10:48:01 +02:00
Nicolas Mounet
cd3f9057f9 Dealing better with the units in ExpirationBLO.aerosols 2021-05-28 07:08:23 +02:00
Nicolas Mounet
89126313ba Merge branch 'feature/multiple_expiration' into feature/refined_expiration_model 2021-05-28 07:02:30 +02:00
Nicolas Mounet
6e49ed4f02 Improving docstrings in expiration classes 2021-05-28 06:56:13 +02:00
Nicolas Mounet
a9cd36df75 Minor docstring fix in ExpirationBLO 2021-05-27 18:35:54 +02:00
Nicolas Mounet
23510c8f1a Adding BLO model for expiration (ExpirationBLO class) 2021-05-27 18:26:37 +02:00