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

added inside_temp and humidity as floats with "_NO_DEFAULT" default value

Browse source
This commit is contained in:
Luis Aleixo 2022-07-05 10:26:06 +02:00
parent ee794ec9b7
commit 7af00de5d4
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
caimira/apps/calculator/model_generator.py
View file

@ -43,7 +43,7 @@ class FormData:
floor_area: float floor_area: float
hepa_amount: float hepa_amount: float
hepa_option: bool hepa_option: bool
humidity: str humidity: float
infected_coffee_break_option: str #Used if infected_dont_have_breaks_with_exposed infected_coffee_break_option: str #Used if infected_dont_have_breaks_with_exposed
infected_coffee_duration: int #Used if infected_dont_have_breaks_with_exposed infected_coffee_duration: int #Used if infected_dont_have_breaks_with_exposed
infected_dont_have_breaks_with_exposed: bool infected_dont_have_breaks_with_exposed: bool
@ -53,7 +53,7 @@ class FormData:
infected_lunch_start: minutes_since_midnight #Used if infected_dont_have_breaks_with_exposed infected_lunch_start: minutes_since_midnight #Used if infected_dont_have_breaks_with_exposed
infected_people: int infected_people: int
infected_start: minutes_since_midnight infected_start: minutes_since_midnight
inside_temp: str inside_temp: float
location_name: str location_name: str
location_latitude: float location_latitude: float
location_longitude: float location_longitude: float
@ -102,7 +102,7 @@ class FormData:
'floor_area': 0., 'floor_area': 0.,
'hepa_amount': 0., 'hepa_amount': 0.,
'hepa_option': False, 'hepa_option': False,
'humidity': '', 'humidity': _NO_DEFAULT,
'infected_coffee_break_option': 'coffee_break_0', 'infected_coffee_break_option': 'coffee_break_0',
'infected_coffee_duration': 5, 'infected_coffee_duration': 5,
'infected_dont_have_breaks_with_exposed': False, 'infected_dont_have_breaks_with_exposed': False,
@ -112,7 +112,7 @@ class FormData:
'infected_lunch_start': '12:30', 'infected_lunch_start': '12:30',
'infected_people': _NO_DEFAULT, 'infected_people': _NO_DEFAULT,
'infected_start': '08:30', 'infected_start': '08:30',
'inside_temp': '', 'inside_temp': _NO_DEFAULT,
'location_latitude': _NO_DEFAULT, 'location_latitude': _NO_DEFAULT,
'location_longitude': _NO_DEFAULT, 'location_longitude': _NO_DEFAULT,
'location_name': _NO_DEFAULT, 'location_name': _NO_DEFAULT,
@ -299,8 +299,9 @@ class FormData:
humidity = 0.5 humidity = 0.5
inside_temp = 293. inside_temp = 293.
else: else:
humidity = float(self.humidity) humidity = self.humidity
inside_temp = float(self.inside_temp) inside_temp = self.inside_temp
room = models.Room(volume=volume, inside_temp=models.PiecewiseConstant((0, 24), (inside_temp,)), humidity=humidity) room = models.Room(volume=volume, inside_temp=models.PiecewiseConstant((0, 24), (inside_temp,)), humidity=humidity)
infected_population = self.infected_population() infected_population = self.infected_population()
@ -741,7 +742,7 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]:
'floor_area': '', 'floor_area': '',
'hepa_amount': '250', 'hepa_amount': '250',
'hepa_option': '0', 'hepa_option': '0',
'humidity': '', 'humidity': '0.5',
'infected_coffee_break_option': 'coffee_break_4', 'infected_coffee_break_option': 'coffee_break_4',
'infected_coffee_duration': '10', 'infected_coffee_duration': '10',
'infected_dont_have_breaks_with_exposed': '1', 'infected_dont_have_breaks_with_exposed': '1',