Skip to content

Commit 825c5ff

Browse files
FlorentinBulotAQFlorentinBulotAQ
committed
update headers
1 parent ea56d55 commit 825c5ff

19 files changed

+24500
-165
lines changed

‎R/calibration_2weeks_40days.rmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Calibration - 2 weeks - 40 days"
3-
author: "FMJ Bulot"
4-
date: "`r format(Sys.time(), '%d %B, %Y, %H:%M')`"
3+
author: "FMJ Bulot ([email protected])"
4+
date: "Last generated: `r format(Sys.time(), '%d %B, %Y, %H:%M')`"
55
output:
66
html_document:
77
df_print: paged
@@ -36,7 +36,7 @@ The results are then aggregated by `calibration_2weeks_40days_agg.r` and stored
3636
in `output/calibration/2weeks_40days_agg`.
3737

3838

39-
```{r}
39+
```{r, message=F}
4040
4141
source("utilities/utilities.R")
4242
source("utilities/nested_models.r")

‎R/calibration_2weeks_restoftheyear.rmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Calibration - 2weeks + evolution"
3-
author: "FMJ Bulot"
4-
date: "`r format(Sys.time(), '%d %B, %Y, %H:%M')`"
3+
author: "FMJ Bulot ([email protected])"
4+
date: "Last generated: `r format(Sys.time(), '%d %B, %Y, %H:%M')`"
55
output:
66
html_document:
77
df_print: paged

‎R/calibration_scenarios_comparison.rmd‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: "Calibration scenarios comparison"
3-
author: "FMJ Bulot"
4-
date: "`r format(Sys.time(), '%d %B, %Y, %H:%M')`"
3+
author: "FMJ Bulot ([email protected])"
4+
date: "Last generated: `r format(Sys.time(), '%d %B, %Y, %H:%M')`"
55
knit: (function(inputFile, encoding) {
6-
out_dir <- '../../docs/';
6+
out_dir <- '../docs/';
77
rmarkdown::render(inputFile,
88
encoding=encoding,
99
output_file=file.path(dirname(inputFile), out_dir, 'calibration_scenarios_comparison.html'))})
@@ -21,25 +21,33 @@ editor_options:
2121
---
2222

2323
This notebook explores the results from the scripts in the folder
24-
`calibration_scenarios_Xweeks_Xmonths`. Note that these scripts require a lot
25-
of computational time and a lost of space to store the results of the
26-
different calibration (about 174Gb).
27-
For each calibration scenario, the script has been divided into several files
28-
so they can be ran in parallel (for instance
29-
using background jobs, launched from the root directory) to speed up the
30-
calculations.
31-
32-
These represents the different calibration scenarios presented in the paper: - 1
33-
week of pre-deployment calibration, 2 months of evaluation, 1 week of
34-
post-deployment calibration - 2 weeks of pre-deployment calibration, 2 months of
35-
evaluation, 2 weeks of post-deployment calibration - 2 weeks of pre-deployment
36-
calibration, 4 months of evaluation, 2 weeks of post-deployment calibration - 2
37-
weeks of pre-deployment calibration, 6 months of evaluation, 2 weeks of
38-
post-deployment calibration - 1 week of pre-deployment calibration, 2 months of
39-
evaluation - 2 weeks of pre-deployment calibration, 2 months of evaluation - 4
40-
weeks of pre-deployment calibration, 2 months of evaluation
24+
`calibration_scenarios_Xweeks_Xmonths`. Note that these scripts require a lot of
25+
computational time and a lost of space to store the results of the different
26+
calibration (about 174Gb). For each calibration scenario, the script has been
27+
divided into several files so they can be ran in parallel (for instance using
28+
background jobs, launched from the root directory) to speed up the calculations.
4129

42-
```{r}
30+
These represents the different calibration scenarios presented in the paper:
31+
32+
- 1 week of pre-deployment calibration, 2 months of evaluation, 1 week of
33+
post-deployment calibration
34+
35+
- 2 weeks of pre-deployment calibration, 2 months of evaluation, 2 weeks of
36+
post-deployment calibration
37+
38+
- 2 weeks of pre-deployment calibration, 4 months of evaluation, 2 weeks of
39+
post-deployment calibration
40+
41+
- 2 weeks of pre-deployment calibration, 6 months of evaluation, 2 weeks of
42+
post-deployment calibration
43+
44+
- 1 week of pre-deployment calibration, 2 months of evaluation
45+
46+
- 2 weeks of pre-deployment calibration, 2 months of evaluation
47+
48+
- 4 weeks of pre-deployment calibration, 2 months of evaluation
49+
50+
```{r, message=F}
4351
4452
source("utilities/utilities.R")
4553
source("utilities/nested_models.r")
@@ -323,12 +331,11 @@ pg_l
323331

324332
## On RLM_part.+RH only
325333

326-
In this section we only focus on the four methods that performed both during the
334+
In this section we only focus on the four methods that performed both during the
327335
robust method selection ((presented in in [Calibration 2 weeks 40
328336
days](calibration_2weeks_40days.html)), with a special focus on RLM_part.+RH for
329337
clarity in the graph.
330338

331-
332339
```{r}
333340
334341
@@ -688,7 +695,6 @@ p_r2
688695
689696
```
690697

691-
692698
# Results in tables
693699

694700
```{r}

‎R/calibration_scenarios_comparison_equivalence.Rmd‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Calibration scenarios comparison"
3-
author: "FMJ Bulot"
4-
date: "`r format(Sys.time(), '%d %B, %Y, %H:%M')`"
3+
author: "FMJ Bulot ([email protected])"
4+
date: "Last generated: `r format(Sys.time(), '%d %B, %Y, %H:%M')`"
55
knit: (function(inputFile, encoding) {
66
out_dir <- '../docs/';
77
rmarkdown::render(inputFile,
@@ -21,7 +21,7 @@ output:
2121
This notebook presents the results from the scripts in the folder
2222
`calibration_Xweeks_Xmonths_equivalence`
2323

24-
```{r}
24+
```{r, message=F}
2525
2626
source("utilities/utilities.R")
2727
source("utilities/nested_models.r")
@@ -301,12 +301,7 @@ res$scenario_type <-
301301
res_bus$cal_method <-
302302
fct_recode(
303303
res_bus$cal_method,
304-
`Koehler_mass+LR` = "koehlermasslr",
305-
`Koehler_mass+OLS` = "koehlermassols",
306-
`Koehler_size+LR` = "koehlersizelr",
307-
`Koehler_size+OLS` = "koehlersizeols",
308304
`Laulainen+LR` = "PM25_corr_Laulainen_rh_LR",
309-
`Laulainen+OLS` = "laulainenols",
310305
`MLR_part.` = "PM25_corr_lm_part_number",
311306
`MLR_part.+RH` = "PM25_corr_lm_part_number_rh",
312307
`LR` = "PM25_corr_LR",
@@ -335,12 +330,7 @@ res_bus$cal_method <-
335330
"RLM+RH",
336331
"RLM_part.",
337332
"RLM_part.+RH",
338-
"Koehler_mass+LR",
339-
"Koehler_mass+OLS",
340-
"Koehler_size+LR",
341-
"Koehler_size+OLS",
342-
"Laulainen+LR",
343-
"Laulainen+OLS"
333+
"Laulainen+LR"
344334
)
345335
346336
res_bus$scenario_type <-

0 commit comments

Comments
 (0)