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 |
|
Nicolas Mounet
|
4609e2ada9
|
Still some fixes on the tests for piecewise constant functions
|
2020-11-04 15:58:04 +01:00 |
|
Nicolas Mounet
|
4bdb23d26b
|
Few improvements on the tests for picewise constant functions
|
2020-11-04 13:49:51 +01:00 |
|
Nicolas Mounet
|
60e84c42e5
|
Adding tests for class defining a piecewise constant function (to be used for temperature dependency)
|
2020-11-04 13:22:56 +01:00 |
|
Philip James Elson
|
241a1ae123
|
Merge branch 'HTML-form' into 'master'
Added foundations of HTML form
See merge request cara/cara!14
|
2020-11-04 10:25:07 +00:00 |
|
gaazzopa
|
5e5bc7ce5c
|
Connected result object to POST request and removed .DS_Store files
|
2020-11-04 11:11:52 +01:00 |
|
gaazzopa
|
86333d7188
|
Added foundations of HTML form
|
2020-11-04 09:39:53 +01:00 |
|
Philip James Elson
|
0d195cb4ce
|
Merge branch 'develop/exp_aerosols_order' into 'master'
Fix the implementation of models.Expiration
Closes #24
See merge request cara/cara!13
|
2020-11-03 18:30:02 +00:00 |
|
Nicolas Mounet
|
ed5e4980cd
|
Avoid dependency of Expiration aerosols on particle_sizes order, in cara/models.py
|
2020-11-03 17:32:06 +01:00 |
|
Nicolas Mounet
|
bc1053e49a
|
Adding test on expiration aerosols (should be independent on particle_sizes order)
|
2020-11-03 17:28:50 +01:00 |
|
Philip James Elson
|
e30c9c0993
|
Merge branch 'feature/calculator-infra' into 'master'
Add the POST endpoint and the infrastructure to allow the calculator form to be developed
See merge request cara/cara!12
|
2020-11-03 15:52:24 +00:00 |
|
Phil Elson
|
adfd4058d9
|
Add the POST endpoint and the infrastructure to allow the calculator form to be developed.
|
2020-11-03 16:40:00 +01:00 |
|
Philip James Elson
|
f2644a720d
|
Merge branch 'develop/nginx_proxy' into 'master'
Fix the rewrite of the old URL, and allow the build to be triggered correctly by the CI.
See merge request cara/cara!11
|
2020-11-03 12:26:01 +00:00 |
|
Phil Elson
|
8ddef2584b
|
Fix the rewrite of the old URL, and allow the build to be triggered correctly by the CI.
|
2020-11-03 13:22:32 +01:00 |
|
Philip James Elson
|
9ffc0e35c1
|
Merge branch 'develop/nginx_proxy' into 'master'
Put a reverse-proxy in front of the voila server to give us more flexibility
Closes #10
See merge request cara/cara!10
|
2020-11-03 11:50:21 +00:00 |
|
Phil Elson
|
ffa2e53994
|
Prepare the repository for having a separate calculator app.
|
2020-11-03 12:42:14 +01:00 |
|
Phil Elson
|
d44ae5501f
|
Put an nginx reverse-proxy in front of the voila server to give us more flexibility in how we present the endpoint.
|
2020-11-03 11:46:53 +01:00 |
|
Markus Kongstein Rognlien
|
cf2ca07768
|
Merge branch 'covid-calculator' into 'master'
Covid calculator
See merge request cara/cara!8
|
2020-10-28 09:40:58 +00:00 |
|
markus
|
b7bd89dcc8
|
remove empty cells
|
2020-10-27 16:07:17 +01:00 |
|
markus
|
cd50c4110f
|
revert to master-state
|
2020-10-27 16:06:39 +01:00 |
|
Markus Kongstein Rognlien
|
b48a296132
|
Merge branch 'pelson/improved_concentration_calculation' into 'master'
Re-work the time interval concept, and fix the concentration calculation for intervals
Closes #14
See merge request cara/cara!9
|
2020-10-27 15:02:34 +00:00 |
|
markus
|
5fdf55d9ed
|
padding tweaks
|
2020-10-27 15:16:14 +01:00 |
|