From c2b6ba2cee3b0d00c2dd9cb546e7676795853bb8 Mon Sep 17 00:00:00 2001 From: jdevine Date: Tue, 10 Aug 2021 19:26:42 +0200 Subject: [PATCH] Changes to temperature handling (more) --- cara/data.py | 2 +- cara/tests/apps/calculator/test_model_generator.py | 8 ++++---- cara/tests/models/test_piecewiseconstant.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cara/data.py b/cara/data.py index ed46af81..4c8c5373 100644 --- a/cara/data.py +++ b/cara/data.py @@ -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) diff --git a/cara/tests/apps/calculator/test_model_generator.py b/cara/tests/apps/calculator/test_model_generator.py index 53045564..e0d62f7d 100644 --- a/cara/tests/apps/calculator/test_model_generator.py +++ b/cara/tests/apps/calculator/test_model_generator.py @@ -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( diff --git a/cara/tests/models/test_piecewiseconstant.py b/cara/tests/models/test_piecewiseconstant.py index 72f3d05e..1f90a5a9 100644 --- a/cara/tests/models/test_piecewiseconstant.py +++ b/cara/tests/models/test_piecewiseconstant.py @@ -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()