Skip to content

Normalization of the computation of the concentration

Nicolas Mounet requested to merge feature/concentration_normalization into master

The emission rate from the infected population enters the concentration as a simple multiplicative factor. This MR exploits this fact (and is transparent result-wise).

Note that the InfectedPopulation methods have been slightly simplifed: individual_emission_rate was never used, hence removed, and emission_rate_when_present now includes the number of infected people - this method was anyway never used directly except in one integration test.

This MR is a strong prerequisite for the introduction of a diameter dependent model.

Performance-wise, this leads to little (if any) improvements:

Before:

[I 210910 14:15:06 web:2239] 200 GET /calculator/baseline-model/result (::1) 7778.55ms
[I 210910 14:15:33 web:2239] 200 GET /calculator/baseline-model/result (::1) 5245.78ms

After:

[I 210910 16:37:34 web:2239] 200 GET /calculator/baseline-model/result (::1) 7668.16ms
[I 210910 16:37:57 web:2239] 200 GET /calculator/baseline-model/result (::1) 4322.63ms

(these numbers are subject to lots of caution, they somehow vary randomly).

Edited by Nicolas Mounet

Merge request reports