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

Changes to temperature handling (more)

Browse source
This commit is contained in:
jdevine 2021-08-10 19:26:42 +02:00
parent 08fcdb1ee2
commit f98fe4b357
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cara/data.py
View file

@ -45,7 +45,7 @@ def location_to_weather_stn(location_loc):
return (station_array[ii[0]][0], station_array[ii[0]][1], station_array[ii[0]][2], station_array[ii[0]][3])
def location_celcius_per_hour(location):
def location_celcius_per_hour(location: object) -> object:
#expects a tuple (lat, long)
#returns a json format set of weather data
w_station = location_to_weather_stn(location)

8
cara/tests/apps/calculator/test_model_generator.py
View file

@ -37,7 +37,7 @@ def test_ventilation_slidingwindow(baseline_form: model_generator.FormData):
window = models.SlidingWindow(
active=models.PeriodicInterval(period=120, duration=10),
inside_temp=models.PiecewiseConstant((0, 24), (293,)),
outside_temp=data.GenevaTemperatures['Dec'],
outside_temp=data.Temperatures['12'],
window_height=1.6, opening_length=0.6,
)
baseline_form.ventilation_type = 'natural_ventilation'
@ -45,7 +45,7 @@ def test_ventilation_slidingwindow(baseline_form: model_generator.FormData):
baseline_form.windows_frequency = 120
baseline_form.window_opening_regime = 'windows_open_periodically'
baseline_form.window_type = 'window_sliding'
baseline_form.event_month = 'December'
baseline_form.event_month = '12'
baseline_form.window_height = 1.6
baseline_form.opening_distance = 0.6
@ -59,7 +59,7 @@ def test_ventilation_hingedwindow(baseline_form: model_generator.FormData):
window = models.HingedWindow(
active=models.PeriodicInterval(period=120, duration=10),
inside_temp=models.PiecewiseConstant((0, 24), (293,)),
outside_temp=data.GenevaTemperatures['Dec'],
outside_temp=data.Temperatures['12'],
window_height=1.6, window_width=1., opening_length=0.6,
)
baseline_form.ventilation_type = 'natural_ventilation'
@ -112,7 +112,7 @@ def test_ventilation_window_hepa(baseline_form: model_generator.FormData):
window = models.SlidingWindow(
active=models.PeriodicInterval(period=120, duration=10),
inside_temp=models.PiecewiseConstant((0, 24), (293,)),
outside_temp=data.GenevaTemperatures['Dec'],
outside_temp=data.Temperatures['12'],
window_height=1.6, opening_length=0.6,
)
hepa = models.HEPAFilter(

2
cara/tests/models/test_piecewiseconstant.py
View file

@ -81,5 +81,5 @@ def test_piecewiseconstant_vs_interval(time):
def test_piecewiseconstant_transition_times():
outside_temp = data.GenevaTemperatures['1']
outside_temp = data.Temperatures['1']
assert set(outside_temp.transition_times) == outside_temp.interval().transition_times()

10
cara/tests/test_monte_carlo_full_models.py
View file

@ -261,10 +261,10 @@ def test_report_models(mc_model, expected_pi, expected_new_cases,
@pytest.mark.parametrize(
"mask_type, month, expected_pi, expected_dose, expected_qR",
[
["No mask", "Jul", 30.0, 6.764, 64.9],
["Type I", "Jul", 10.2, 1.223, 11.7],
["FFP2", "Jul", 4.0, 1.223, 11.7],
["Type I", "Feb", 4.25, 0.357, 11.7],
["No mask", "7", 30.0, 6.764, 64.9],
["Type I", "7", 10.2, 1.223, 11.7],
["FFP2", "7", 4.0, 1.223, 11.7],
["Type I", "2", 4.25, 0.357, 11.7],
],
)
def test_small_shared_office_Geneva(mask_type, month, expected_pi,
@ -276,7 +276,7 @@ def test_small_shared_office_Geneva(mask_type, month, expected_pi,
models.SlidingWindow(
active=models.SpecificInterval(((0,24),)),
inside_temp=models.PiecewiseConstant((0, 24), (293,)),
outside_temp=data.GenevaTemperatures[month],
outside_temp=data.Temperatures[month],
window_height=1.5, opening_length=0.2,
),
models.AirChange(