From 0e1fec830751d41636e1725eb7d8fd20c808fb23 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Sun, 7 Feb 2021 19:01:06 +0100 Subject: [PATCH] change string from excercise to activity --- cara/montecarlo.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cara/montecarlo.py b/cara/montecarlo.py index d52e9c57..19ad94f0 100644 --- a/cara/montecarlo.py +++ b/cara/montecarlo.py @@ -446,7 +446,7 @@ def present_model(model: MCConcentrationModel, bins: int = 200) -> None: axs[0, 1].set_ylabel('Particle emission concentration [$cm^{-3}$]') axs[0, 1].set_xlabel(r'Diameter [$\mu$m]') - categories = ("seated", "standing", "light exercise", "moderate exercise", "heavy exercise") + categories = ("seated", "standing", "light activity", "moderate activity", "heavy activity") axs[1, 0].set_title(f'Breathing rate - ' f'{categories[model.infected.breathing_category - 1]}') axs[1, 0].set_xlabel('Breathing rate [$m^3\;h^{-1}$]') @@ -460,7 +460,13 @@ def present_model(model: MCConcentrationModel, bins: int = 200) -> None: fig.legend(handles=(mean_patch, std_patch, median_patch)) plt.show() - print(10**np.median(data)) + print( + 10**np.median(data), + np.median(10**data), + np.mean(data), + np.mean(10**data), # is this correct? + np.std(data), + np.std(10**data)) # is this correct? def buaonanno_exposure_model(): @@ -557,7 +563,6 @@ plt.xticks(ticks=[1, 2], labels=['Original', 'English']) plt.ylabel('Percentage probability of infection') plt.show() - # pis = baseline_mc_exposure_model.infection_probability() # plt.hist(pis, bins=2000) # plt.title("Distribution of probabilities of infection")