Commit graph

2282 commits

Author SHA1 Message Date
Luis Aleixo
a54da08789 renamed and moved total_people for short-range interactions to the exposure model 2024-05-24 16:42:03 +02:00
Luis Aleixo
70dc4a93d6 simplified report logic 2024-05-24 16:42:03 +02:00
Luis Aleixo
507e586757 re-factor expected new cases method 2024-05-24 16:42:03 +02:00
Luis Aleixo
abd6bb0767 display the input in form 2024-05-24 16:41:33 +02:00
Luis Aleixo
862010a9e0 added validation 2024-05-24 16:41:33 +02:00
Luis Aleixo
0352675878 added input to model generator from form 2024-05-24 16:41:33 +02:00
Luis Aleixo
e97a4cc805 added new model input 2024-05-24 16:41:33 +02:00
Luis Aleixo
3327b6e461 Merge branch 'feature/activity_types_fix' into 'master'
Fixed error in placeholder for secondary school (data registry defaults)

See merge request caimira/caimira!494
2024-05-24 16:14:06 +02:00
Luis Aleixo
cf99568a70 modified way to restrict pytest version to be installed 2024-05-23 14:52:18 +02:00
Luis Aleixo
6202ac0874 fixed error in placeholder for secondary school (data registry defaults) 2024-05-23 14:47:49 +02:00
Luis Aleixo
477e5707c6 Merge branch 'bugfix/r0_short_range' into 'master'
Fixed bug with expected new cases when short range interactions are defined

See merge request caimira/caimira!492
2024-04-21 13:07:04 +02:00
Luis Aleixo
00b5dc535d fixed bug with expected new cases when short range interactions are defined 2024-04-20 13:54:46 +01:00
Luis Aleixo
585dba57e9 Merge branch 'changes/form_data_schema_data' into 'master'
Added placeholder for activity types

See merge request caimira/caimira!489
2024-04-18 10:48:21 +02:00
Luis Aleixo
6f537e1df3 updated patch version 2024-04-18 10:35:22 +02:00
Luis Aleixo
6a69f91c90 added placeholder for activity types and fetched this data directly in form calculator 2024-04-18 10:28:39 +02:00
Luis Aleixo
a843c47b83 Merge branch 'feature/parallel-deposited-exposures-version' into 'master'
Increased calculator (minor) version with parallel computing

See merge request caimira/caimira!491
2024-04-12 15:35:31 +02:00
Luis Aleixo
f06bb83d30 increased minor version with parallel computing 2024-04-11 15:44:40 +02:00
Luis Aleixo
5042f5d82f Merge branch 'feature/parallel-deposited-exposures' into 'master'
model: compute deposited exposures in parallel

See merge request caimira/caimira!490
2024-03-26 14:23:34 +01:00
Luis Aleixo
ddf7684798 added executor factory to ConcentrationModelJsonResponse class 2024-03-20 11:32:01 +01:00
Nicola Tarocco
c52d017a31
model: compute deposited exposures in parallel
* compute deposited exposures by calculating each time window in a thread,
  in parallel
* compute the CO2 concentration calcuation of each window in parallel
* the usage of multithreading speeds up the overall calculation by at
  least by a factor of 3.
2024-03-17 18:12:39 +01:00
Luis Aleixo
4ed285d84a Merge branch 'bugfix/env_var_and_report_bug' into 'master'
Bugfix/env var and report bug

See merge request caimira/caimira!488
2024-03-11 15:22:47 +01:00
Luis Aleixo
24b3eba422 fixed bug on displaying inf. probability > 99.9% 2024-03-11 13:45:41 +01:00
Luis Aleixo
5e9d6501ae added cast to int when fetching env. variables 2024-03-11 13:44:58 +01:00
Luis Aleixo
600830a495 Merge branch 'changes/enable_env_vars' into 'master'
Handled environment variables to be consistent

See merge request caimira/caimira!486
2024-03-08 09:38:21 +01:00
Luis Aleixo
b0c9aefe34 disabled data service (OKD template) 2024-03-08 09:29:57 +01:00
Luis Aleixo
c5963a978a Added timeout to fetch method 2024-03-06 14:26:35 +01:00
Luis Aleixo
c8cc0b0908 handled environment variables to be consistent 2024-03-05 17:03:19 +01:00
Luis Aleixo
e0c2e959a2 Merge branch 'update-deps' into 'master'
upgrade dependencies

See merge request caimira/caimira!483
2024-02-28 14:55:06 +01:00
Nicola Tarocco
ddfe0b660e
tests: make report generation time limit configurable 2024-02-27 21:17:46 +01:00
Nicola Tarocco
d1555d77fc
upgrade dependencies 2024-02-27 21:10:27 +01:00
Luis Aleixo
55850f9971 Merge branch 'feature/profiler' into 'master'
Profiler

See merge request caimira/caimira!480
2024-02-16 15:29:15 +01:00
Luis Aleixo
0590a27fdc Merge branch 'feature/schema_updates' into 'master'
Data Service - Schema Update

See merge request caimira/caimira!482
2024-02-14 14:49:19 +01:00
Luis Aleixo
f9d2fc39ec mypy fix 2024-02-12 12:10:33 +01:00
Nicola Tarocco
00dc79f492
add PyInstrument and cProfile profilers 2024-02-11 17:40:47 +01:00
Luis Aleixo
c78ffadc02 updated qa to prod in data service fetch 2024-01-31 16:39:36 +01:00
Luis Aleixo
38376857fa modified activity types 2024-01-31 11:50:29 +01:00
Luis Aleixo
7199143257 removed authentication methods and tests for data service 2024-01-31 11:50:12 +01:00
Luis Aleixo
d09d6f0ec8 methods updated to reflect changes 2024-01-26 10:30:59 +01:00
Luis Aleixo
b498e776f7 updated data registry to reflect changes in test data service 2024-01-26 10:30:37 +01:00
Luis Aleixo
667135595c Merge branch 'bugfix/CO2_form' into 'master'
Bugfix on CO2FormGeneration related with global store

See merge request caimira/caimira!479
2023-12-22 14:26:31 +01:00
Luis Aleixo
2deba13950 bugfix 2023-12-22 08:37:41 +00:00
Andre Henriques
45b81b1761 Merge branch 'feature/inject-data-service' into 'master'
inject data registry instance instead of static config

Closes #365

See merge request caimira/caimira!476
2023-12-20 14:44:25 +01:00
Luis Aleixo
ddecd91a85 increased version 2023-12-20 13:20:01 +00:00
Luis Aleixo
17a5fa6316 Merge branch 'feature/resizable_histogram' into 'master'
Result uncertainties resizable

See merge request caimira/caimira!477
2023-12-15 14:49:04 +01:00
Luis Aleixo
d3daca23d3 updated enum values and removed fixme references 2023-12-14 15:44:39 +01:00
Nicola Tarocco
00ff1af71d fix enums for data service 2023-12-14 15:34:08 +01:00
Luis Aleixo
d79ef934cb finished injection of data_service param 2023-12-14 15:34:08 +01:00
Luis Aleixo
20e8bf1df7 added data_service attr where needed 2023-12-14 15:34:08 +01:00
Nicola Tarocco
2abdd130cf config: remove Ref: config parsing 2023-12-14 15:34:08 +01:00
Nicola Tarocco
bb51eaa360 config: inject data registry instance instead of static config
* closes #365
2023-12-14 15:34:08 +01:00