Skip to content

Commit

Permalink
Merge branch 'equity' into validation_test1
Browse files Browse the repository at this point in the history
  • Loading branch information
@LucieContamin
LucieContamin committed Apr 16, 2024
2 parents 9911857 + ec8f75b commit e2ece10
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions code/validation.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ pr_files <- gh::gh(paste0("GET /repos/",
Sys.getenv("GH_PR_NUMBER"), "/files"))

pr_files_name <- purrr::map(pr_files, "filename")
pr_files_name <- pr_files_name[!"removed" == purrr::map(pr_files, "status")]
pr_sub_files <-
stringr::str_extract(pr_files_name,
"data-processed/.+/\\d{4}-\\d{2}-\\d{2}(-.*)?")
Expand Down Expand Up @@ -73,12 +74,11 @@ if (length(pr_sub_files) > 0) {
# Visualization
df <- try({
arrow::open_dataset(val_path, partitioning = partition) %>%
dplyr::filter(output_type == "quantile",
origin_date == sub_file_date) %>%
dplyr::filter(output_type == "quantile") %>%
dplyr::collect()
})
print(head(df))
if (class(df) != "try-error" && nrow(df) > 0) {
# print(head(df))
if (all(class(df) != "try-error") && nrow(df) > 0) {
test_viz <- try(generate_validation_plots(
path_proj = val_path, lst_gs = NULL,
save_path = paste0(getwd(), "/proj_plot"), y_sqrt = FALSE,
Expand Down
Binary file removed data-processed/team2-modelb/2024-03-26-team2-modelb.parquet
View file
Binary file not shown.
Binary file added data-processed/team2-modelb/2024-05-15-team2-modelb.gz.parquet
View file
Binary file not shown.
Binary file removed data-processed/team3-modelc/2024-03-26-team3-modelc.parquet
View file
Binary file not shown.
Binary file added data-processed/team3-modelc/2024-05-15-team3-modelc.gz.parquet
View file
Binary file not shown.
Binary file removed data-processed/team4-modeld/2024-03-26-team4-modeld.parquet
View file
Binary file not shown.
Binary file removed data-processed/team5-modele/2024-03-26-team5-modele.parquet
View file
Binary file not shown.
Binary file added data-processed/team5-modele/2024-05-15-team5-modele.gz.parquet
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions hub-config/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@
"start":"2023-11-14","end":"2023-12-14"}
},
{
"round_id": "2024-03-26",
"round_id": "2024-05-15",
"round_id_from_variable": false,
"model_tasks": [
{
Expand All @@ -898,7 +898,7 @@
"optional": null
},
"scenario_id": {
"required": ["A-2020-11-15"],
"required": ["A-2020-05-01"],
"optional": null
},
"location": {
Expand Down Expand Up @@ -926,7 +926,7 @@
"samples_joint_across": ["horizon", "race_ethnicity"]
},
"value" : {
"type": "double",
"type": "numeric",
"minimum": 0
}
}
Expand All @@ -949,7 +949,7 @@
"target_name": "Incident Infection",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc inf"
},
"description": "Weekly new COVID-19 infection.",
"target_type": "discrete",
Expand All @@ -961,7 +961,7 @@
"target_name": "Incident cases",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc case"
},
"description": "Weekly newly reported COVID-19 cases",
"target_type": "discrete",
Expand All @@ -977,7 +977,7 @@
"optional": null
},
"scenario_id": {
"required": ["A-2020-11-15"],
"required": ["A-2020-05-01"],
"optional": null
},
"location": {
Expand Down Expand Up @@ -1005,7 +1005,7 @@
"samples_joint_across": ["horizon", "race_ethnicity"]
},
"value" : {
"type": "double",
"type": "numeric",
"minimum": 0
}
}
Expand All @@ -1028,7 +1028,7 @@
"target_name": "Incident Infection",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc inf"
},
"description": "Weekly new COVID-19 infection.",
"target_type": "discrete",
Expand All @@ -1040,7 +1040,7 @@
"target_name": "Incident cases",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc case"
},
"description": "Weekly newly reported COVID-19 cases",
"target_type": "discrete",
Expand All @@ -1056,7 +1056,7 @@
"optional": null
},
"scenario_id": {
"required": ["A-2020-11-15"],
"required": ["A-2020-05-01"],
"optional": null
},
"location": {
Expand All @@ -1083,7 +1083,7 @@
"optional": [0, 1]
},
"value" : {
"type": "double",
"type": "numeric",
"minimum": 0
}
}
Expand All @@ -1106,7 +1106,7 @@
"target_name": "Incident Infection",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc inf"
},
"description": "Weekly new COVID-19 infection.",
"target_type": "discrete",
Expand All @@ -1118,7 +1118,7 @@
"target_name": "Incident cases",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc case"
},
"description": "Weekly newly reported COVID-19 cases",
"target_type": "discrete",
Expand All @@ -1134,7 +1134,7 @@
"optional": null
},
"scenario_id": {
"required": ["A-2020-11-15"],
"required": ["A-2020-05-01"],
"optional": null
},
"location": {
Expand All @@ -1161,7 +1161,7 @@
"optional": [0, 1]
},
"value" : {
"type": "double",
"type": "numeric",
"minimum": 0
}
}
Expand All @@ -1184,7 +1184,7 @@
"target_name": "Incident Infection",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc inf"
},
"description": "Weekly new COVID-19 infection.",
"target_type": "discrete",
Expand All @@ -1196,7 +1196,7 @@
"target_name": "Incident cases",
"target_units": "count",
"target_keys": {
"target": "inc hosp"
"target": "inc case"
},
"description": "Weekly newly reported COVID-19 cases",
"target_type": "discrete",
Expand Down

0 comments on commit e2ece10

Please sign in to comment.