- Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally (i.e. without short-range interactions), the probability of one exposed occupant getting infected is {{ long_range_prob_inf | non_zero_percentage }} and the expected number of new cases is {{ expected_new_cases | float_format }}*.
+ Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally (i.e. without short-range interactions), the probability of one exposed occupant getting infected is {{ long_range_prob_inf | non_zero_percentage }} and the expected number of new cases is {{ long_range_expected_cases | float_format }}*.
{% if form.short_range_option == "short_range_yes" %}
- In this scenario, assuming short-range interactions occur, the probability of one exposed occupant getting infected can go as high as {{ prob_inf | non_zero_percentage }}.
+ In this scenario, the probability the occupant(s) exposed to short-range interactions get infected can go as high as {{ prob_inf | non_zero_percentage }} and the expected number of new cases increases to {{ expected_new_cases | float_format }}.
{% endif %}
{% block probabilistic_exposure_probability %}
@@ -206,10 +215,12 @@
-
-
-
-
+ {% if model.data_registry.virological_data['virus_distributions'][form.virus_type]['viral_load_in_sputum'] == 'Ref: Viral load - covid_overal_vl_data' %}
+
+
+
+
+ {% endif %}
{% if form.conditional_probability_plot %}
- Short-range interactions: {{ form.short_range_interactions|length }} -
Total number of occupants having short-range interactions: {{ form.short_range_occupants }}
-
{% for interaction in form.short_range_interactions %}
-
- Expiratory activity {{ loop.index if form.short_range_interactions|length > 1 }}: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }} -
- Start time {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.start_time }} -
- Duration {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }} +
- Interaction no. {{ loop.index }}:
+
-
+
- Expiratory activity: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }} +
- Start time: {{ interaction.start_time }} +
- Duration: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }} +
{% endfor %}
- +
Applications
CAiMIRA is composed of two applications, the Calculator and the Expert App.
+ CAiMIRA is composed of two applications, the Calculator and the Expert App.
About
Acceptable:
{% endif %}
- Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally (i.e. without short-range interactions), the probability of one exposed occupant getting infected is {{long_range_prob_inf | non_zero_percentage}} and the expected number of new cases is {{expected_new_cases | float_format}}*.
+ Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally (i.e. without short-range interactions), the probability of one exposed occupant getting infected is {{long_range_prob_inf | non_zero_percentage}} and the expected number of new cases is {{ long_range_expected_cases | float_format }}*.
{% if form.short_range_option == "short_range_yes" %}
@@ -84,7 +84,7 @@
Acceptable:
{% endif %}
- In this scenario, assuming short-range interactions occur, the probability of one exposed occupant getting infected can go as high as {{prob_inf | non_zero_percentage}}.
+ In this scenario, the probability the occupant(s) exposed to short-range interactions get infected can go as high as {{ prob_inf | non_zero_percentage }} and the expected number of new cases increases to {{ expected_new_cases | float_format }}.
{% endif %}
diff --git a/ui/apps/templates/expert-app.html.j2 b/ui/apps/templates/expert-app.html.j2
new file mode 100644
index 00000000..93c81e47
--- /dev/null
+++ b/ui/apps/templates/expert-app.html.j2
@@ -0,0 +1,18 @@
+{% extends "base/layout.html.j2" %}
+
+{% block main %}
+
+
+
+
+ +With the latest feature implementations in the core CAiMIRA engine, the ExpertApplication and CO2Application apps are no longer actively maintained. +For legacy purposes, the source code is still available in the GitLab repository. +
+For any query, please let us know by sending an email to CAiMIRA-dev@cern.ch. +
+ + +
+
+{% endblock main %}
diff --git a/ui/apps/tests/test_expert_app.py b/ui/apps/tests/test_expert_app.py
index 58cbd3e3..c79008ad 100644
--- a/ui/apps/tests/test_expert_app.py
+++ b/ui/apps/tests/test_expert_app.py
@@ -8,6 +8,7 @@ def expert_app():
return exp.ExpertApplication()
+@pytest.mark.skip(reason="ExpertApplication is deactivated")
def test_app(expert_app):
# To start with, let's just test that the application runs. We don't try to
# do anything fancy to verify how it looks etc., we leave that for manual
@@ -15,6 +16,7 @@ def test_app(expert_app):
assert expert_app._model_scenarios[0][0] == "Scenario 1"
+@pytest.mark.skip(reason="ExpertApplication is deactivated")
def test_new_scenario_changes_tab(expert_app):
# Adding a new scenario should change the tab index of the multi-model view.
assert expert_app.multi_model_view.widget.selected_index == 0
diff --git a/ui/apps/tests/test_report_generator.py b/ui/apps/tests/test_report_generator.py
index 08025ec5..f9fd6d37 100644
--- a/ui/apps/tests/test_report_generator.py
+++ b/ui/apps/tests/test_report_generator.py
@@ -7,8 +7,9 @@
import pytest
from ui.apps.calculator import make_app
-from ui.apps.calculator import ReportGenerator
-from ui.apps.calculator.report import readable_minutes
+from caimira.apps.calculator.model_generator import VirusFormData
+from caimira.apps.calculator.report_generator import (ReportGenerator, readable_minutes, calculate_report_data,
+ manufacture_alternative_scenarios, interesting_times, comparison_report)
import caimira.calculator.report.report_generator as rep_gen
from caimira.api.controller.report_controller import generate_model, generate_report_results
@@ -105,3 +106,27 @@ def test_interesting_times_w_temp(exposure_model_w_outside_temp_changes):
5., 5.4, 5.8, 6.2, 6.6, 7., 7.4, 7.8, 8.
]
np.testing.assert_allclose(result, expected)
+
+
+def test_expected_new_cases(baseline_form_with_sr: VirusFormData):
+ model = baseline_form_with_sr.build_model()
+
+ executor_factory = partial(
+ concurrent.futures.ThreadPoolExecutor, 1,
+ )
+
+ # Short- and Long-range contributions
+ report_data = calculate_report_data(baseline_form_with_sr, model, executor_factory)
+ sr_lr_expected_new_cases = report_data['expected_new_cases']
+ sr_lr_prob_inf = report_data['prob_inf']/100
+
+ # Long-range contributions alone
+ scenario_sample_times = interesting_times(model)
+ alternative_scenarios = manufacture_alternative_scenarios(baseline_form_with_sr)
+ alternative_statistics = comparison_report(
+ baseline_form_with_sr, report_data, alternative_scenarios, scenario_sample_times, executor_factory=executor_factory,
+ )
+
+ lr_expected_new_cases = alternative_statistics['stats']['Base scenario without short-range interactions']['expected_new_cases']
+ np.testing.assert_almost_equal(sr_lr_expected_new_cases, lr_expected_new_cases + sr_lr_prob_inf * baseline_form_with_sr.short_range_occupants, 2)
+
\ No newline at end of file
CAiMIRA Expert Apps currently deactivated
+ +With the latest feature implementations in the core CAiMIRA engine, the ExpertApplication and CO2Application apps are no longer actively maintained. +For legacy purposes, the source code is still available in the GitLab repository. +
+For any query, please let us know by sending an email to CAiMIRA-dev@cern.ch. +
+ + +