Phil Elson
|
331b8e733f
|
Fix to use the updated PiecewiseConstant scheme for temperatures, and turn on testing, even if trivial, for the report generation.
|
2020-11-05 23:22:17 +01:00 |
|
Philip James Elson
|
2d69c7bfa8
|
Merge branch 'UI-formalities' into 'master'
UI formalties and updates
See merge request cara/cara!25
|
2020-11-05 19:55:34 +00:00 |
|
gaazzopa
|
5f502fb480
|
Removed extra library and form reset
|
2020-11-05 18:02:41 +01:00 |
|
gaazzopa
|
8a83ad9567
|
Added infected start and finish to form
|
2020-11-05 17:36:38 +01:00 |
|
Philip James Elson
|
bc88455d79
|
Merge branch 'present-intervals' into 'master'
Present intervals
See merge request cara/cara!26
|
2020-11-05 15:39:16 +00:00 |
|
markus
|
f04f813e25
|
remove unnecessary leftovers from model_from_form
|
2020-11-05 16:22:20 +01:00 |
|
markus
|
f896cbf094
|
add test for present_intervals
|
2020-11-05 16:17:52 +01:00 |
|
markus
|
a28227e7ac
|
fix typo
|
2020-11-05 16:10:28 +01:00 |
|
markus
|
97c667911f
|
split long line
|
2020-11-05 16:01:08 +01:00 |
|
Philip James Elson
|
834d4e174d
|
Merge branch 'model-dict' into 'master'
Model dict
See merge request cara/cara!24
|
2020-11-05 14:55:23 +00:00 |
|
gaazzopa
|
2d2241b6e2
|
Disabled event details based on natural vent
|
2020-11-05 15:46:30 +01:00 |
|
markus
|
9190a33634
|
change baseline_raw_form_data
|
2020-11-05 15:43:27 +01:00 |
|
markus
|
3f7c761925
|
move interval-calculation into separate function
|
2020-11-05 15:42:40 +01:00 |
|
markus
|
5f2f2e5dbf
|
add quick-fix for undefined numerical attributes
|
2020-11-05 14:49:03 +01:00 |
|
markus
|
ae0b91621b
|
populate Formdata attributes
|
2020-11-05 14:43:22 +01:00 |
|
Nicolas Mounet
|
3972b887b1
|
Merge branch 'feature/pytest-param' into 'master'
Parameterize the tests to allow easier debugging and simplify the logic in the test itself.
See merge request cara/cara!22
|
2020-11-05 13:08:36 +00:00 |
|
gaazzopa
|
3dcfa213c9
|
Added disclaimer and code license
|
2020-11-05 14:03:15 +01:00 |
|
gaazzopa
|
74e930b490
|
Added possibility of float values
|
2020-11-05 14:02:15 +01:00 |
|
markus
|
82d2e74188
|
add time_string_to_minutes
|
2020-11-05 13:58:55 +01:00 |
|
Philip James Elson
|
280de17dac
|
Merge branch 'feature/model_to_report' into 'master'
Include @marcus' generate_report_data function in the report_generator.
See merge request cara/cara!23
|
2020-11-05 12:50:14 +00:00 |
|
Phil Elson
|
bb82d7c8f2
|
Include @marcus' generate_report_data function in the report_generator.
|
2020-11-05 13:00:31 +01:00 |
|
Phil Elson
|
e663a89560
|
Parameterize the tests to allow easier debugging and simplify the logic in the test itself.
|
2020-11-05 12:55:00 +01:00 |
|
Philip James Elson
|
aadbb8c1dd
|
Merge branch 'develop/temperature_dependency' into 'master'
Implementation of outside temperature time dependency
Closes #15
See merge request cara/cara!19
|
2020-11-05 11:43:36 +00:00 |
|
Philip James Elson
|
7978b8d759
|
Merge branch 'RESTwireframe' into 'master'
Updated UI to latest wireframe
See merge request cara/cara!21
|
2020-11-05 11:34:30 +00:00 |
|
Phil Elson
|
967e7a86c7
|
Resolve the merge conflic for #21.
|
2020-11-05 12:32:12 +01:00 |
|
Nicolas Mounet
|
4e31a411a0
|
Implementing default value beyond the interval of definition, for PiecewiseConstant objects (models.py)
|
2020-11-05 12:08:08 +01:00 |
|
Nicolas Mounet
|
4ea8b70079
|
Adding tests on values beyond the interval of definition, for piecwise constant functions; some tests renaming
|
2020-11-05 12:07:26 +01:00 |
|
gaazzopa
|
aa2cf9cc82
|
Removed .pyc files
|
2020-11-05 11:55:17 +01:00 |
|
Gabriella Azzopardi
|
7bf3c07296
|
Merge branch 'master' into 'RESTwireframe'
# Conflicts:
# cara/apps/calculator/static/form.html
|
2020-11-05 10:50:14 +00:00 |
|
gaazzopa
|
f98a96f546
|
Finalised input validation and updated form with new fields
|
2020-11-05 11:36:36 +01:00 |
|
Philip James Elson
|
260af15781
|
Merge branch 'feature/form-to-model' into 'master'
Generate a model from the form
See merge request cara/cara!20
|
2020-11-05 10:12:44 +00:00 |
|
Phil Elson
|
f7853feb6f
|
Restructure the calculator app to have a strong separation between the form input and the form processing.
|
2020-11-05 11:05:40 +01:00 |
|
Nicolas Mounet
|
ec98687233
|
Adding transition_times method to Ventilation, and changing Model class accordingly
|
2020-11-05 09:52:58 +01:00 |
|
Nicolas Mounet
|
f9335710b6
|
Renaming PiecewiseconstantFunction class into PiecewiseConstant
|
2020-11-05 09:10:07 +01:00 |
|
markus
|
cecd029142
|
Initial cara.calculator.model_generator implementation from @mrognlie.
|
2020-11-05 08:57:08 +01:00 |
|
Philip James Elson
|
2f61d2a264
|
Merge branch 'Calculator-report-page' into 'master'
Added foundations of calculator report page
See merge request cara/cara!18
|
2020-11-05 06:51:28 +00:00 |
|
Nicolas Mounet
|
71c6f08cb6
|
Adding hours of temperature changes to the state_change_times in the Model class
|
2020-11-05 01:08:05 +01:00 |
|
Nicolas Mounet
|
4254c87ac2
|
Correcting missing first hour in Geneva temperatures
|
2020-11-05 01:06:04 +01:00 |
|
Nicolas Mounet
|
3604c6c91c
|
Adding two tests for the hourly dependent model
|
2020-11-05 01:04:32 +01:00 |
|
Nicolas Mounet
|
ae5cb9536b
|
baseline_model in tests and expert.py, now use piecewise constant temperatures
|
2020-11-04 23:39:41 +01:00 |
|
Nicolas Mounet
|
15aee76ca9
|
Manipulating tuples rather than lists in PiecewiseconstantFunction objects (also in tests), for hashing purposes
|
2020-11-04 23:35:06 +01:00 |
|
Nicolas Mounet
|
d1246c463e
|
Replacing inside and outside temperature by piecewise constant functions, in WindowOpening class (models.py)
|
2020-11-04 22:54:51 +01:00 |
|
Nicolas Mounet
|
b070bb2899
|
Modifying the test on the WindowOpening class, using time-dependent temperature
|
2020-11-04 22:44:27 +01:00 |
|
Nicolas Mounet
|
ec2a54c0a6
|
Bug fix in PiecewiseconstantFunction (models.py)
|
2020-11-04 22:42:01 +01:00 |
|
gaazzopa
|
e4d5066c87
|
Added foundations of calculator report page
|
2020-11-04 22:18:08 +01:00 |
|
Nicolas Mounet
|
e49579d3fe
|
Bug fixed in piecewise constant function test; adding a test on ACH computation with windows opened
|
2020-11-04 22:03:31 +01:00 |
|
Nicolas Mounet
|
71c032cf01
|
Converting Geneva temperatures to Kelvin
|
2020-11-04 21:35:20 +01:00 |
|
Nicolas Mounet
|
76c4364e8f
|
Adding Geneva hourly temperatures in models.py
|
2020-11-04 21:10:26 +01:00 |
|
Nicolas Mounet
|
c5dc9d9a4f
|
Adding PiecewiseconstantFunction class in models.py (for temperature)
|
2020-11-04 20:57:49 +01:00 |
|
jdevine
|
825ec88025
|
UI update based on wireframe
|
2020-11-04 20:12:55 +01:00 |
|