pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated enum values and removed fixme references

Browse source
This commit is contained in:
Luis Aleixo 2023-12-14 15:44:39 +01:00
parent 00ff1af71d
commit d3daca23d3
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
caimira/enums.py
View file

@ -1,13 +1,13 @@
from enum import Enum
class ViralLoads(Enum):
COVID_OVERALL = "COVID overall"
SYMPTOMATIC_FREQUENCIES = "Symptomatic frequencies"
COVID_OVERALL = "Ref: Viral load - covid_overal_vl_data"
SYMPTOMATIC_FREQUENCIES = "Ref: Viral load - symptomatic_vl_frequencies"
class InfectiousDoses(Enum):
DISTRIBUTION = "Distribution"
DISTRIBUTION = "Ref: Infectious dose - infectious_dose_distribution"
class ViableToRNARatios(Enum):
DISTRIBUTION = "Distribution"
DISTRIBUTION = "Ref: Viable to RNA ratio - viable_to_RNA_ratio_distribution"

17
caimira/monte_carlo/data.py
View file

@ -15,13 +15,6 @@ from caimira.store.data_registry import DataRegistry
def evaluate_vl(value, data_registry: DataRegistry):
# FIXME: temp fix until data service values is updated
# remove old Ref value
if "covid_overal_vl_data" in value:
value = ViralLoads.COVID_OVERALL.value
elif "symptomatic_vl_frequencies" in value:
value = ViralLoads.SYMPTOMATIC_FREQUENCIES.value
if value == ViralLoads.COVID_OVERALL.value:
return covid_overal_vl_data(data_registry)
elif value == ViralLoads.SYMPTOMATIC_FREQUENCIES.value:
@ -31,11 +24,6 @@ def evaluate_vl(value, data_registry: DataRegistry):
def evaluate_infectd(value, data_registry: DataRegistry):
# FIXME: temp fix until data service values is updated
# remove old Ref value
if "infectious_dose_distribution" in value:
value = InfectiousDoses.DISTRIBUTION.value
if value == InfectiousDoses.DISTRIBUTION.value:
return infectious_dose_distribution(data_registry)
else:
@ -43,11 +31,6 @@ def evaluate_infectd(value, data_registry: DataRegistry):
def evaluate_vtrr(value, data_registry: DataRegistry):
# FIXME: temp fix until data service values is updated
# remove old Ref value
if "viable_to_RNA_ratio_distribution" in value:
value = ViableToRNARatios.DISTRIBUTION.value
if value == ViableToRNARatios.DISTRIBUTION.value:
return viable_to_RNA_ratio_distribution(data_registry)
else: