diff --git a/code/validation.R b/code/validation.R index 29be3a0..48c4d82 100644 --- a/code/validation.R +++ b/code/validation.R @@ -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}(-.*)?") @@ -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, diff --git a/data-processed/team2-modelb/2024-03-26-team2-modelb.parquet b/data-processed/team2-modelb/2024-03-26-team2-modelb.parquet deleted file mode 100644 index cd018eb..0000000 Binary files a/data-processed/team2-modelb/2024-03-26-team2-modelb.parquet and /dev/null differ diff --git a/data-processed/team2-modelb/2024-05-15-team2-modelb.gz.parquet b/data-processed/team2-modelb/2024-05-15-team2-modelb.gz.parquet new file mode 100644 index 0000000..b7e8de8 Binary files /dev/null and b/data-processed/team2-modelb/2024-05-15-team2-modelb.gz.parquet differ diff --git a/data-processed/team3-modelc/2024-03-26-team3-modelc.parquet b/data-processed/team3-modelc/2024-03-26-team3-modelc.parquet deleted file mode 100644 index e3e7fb0..0000000 Binary files a/data-processed/team3-modelc/2024-03-26-team3-modelc.parquet and /dev/null differ diff --git a/data-processed/team3-modelc/2024-05-15-team3-modelc.gz.parquet b/data-processed/team3-modelc/2024-05-15-team3-modelc.gz.parquet new file mode 100644 index 0000000..49b389a Binary files /dev/null and b/data-processed/team3-modelc/2024-05-15-team3-modelc.gz.parquet differ diff --git a/data-processed/team4-modeld/2024-03-26-team4-modeld.parquet b/data-processed/team4-modeld/2024-03-26-team4-modeld.parquet deleted file mode 100644 index d065ee6..0000000 Binary files a/data-processed/team4-modeld/2024-03-26-team4-modeld.parquet and /dev/null differ diff --git a/data-processed/team5-modele/2024-03-26-team5-modele.parquet b/data-processed/team5-modele/2024-03-26-team5-modele.parquet deleted file mode 100644 index 9f415aa..0000000 Binary files a/data-processed/team5-modele/2024-03-26-team5-modele.parquet and /dev/null differ diff --git a/data-processed/team5-modele/2024-05-15-team5-modele.gz.parquet b/data-processed/team5-modele/2024-05-15-team5-modele.gz.parquet new file mode 100644 index 0000000..32e8979 Binary files /dev/null and b/data-processed/team5-modele/2024-05-15-team5-modele.gz.parquet differ diff --git a/hub-config/tasks.json b/hub-config/tasks.json index 7a2b3d9..92bb348 100644 --- a/hub-config/tasks.json +++ b/hub-config/tasks.json @@ -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": [ { @@ -898,7 +898,7 @@ "optional": null }, "scenario_id": { - "required": ["A-2020-11-15"], + "required": ["A-2020-05-01"], "optional": null }, "location": { @@ -926,7 +926,7 @@ "samples_joint_across": ["horizon", "race_ethnicity"] }, "value" : { - "type": "double", + "type": "numeric", "minimum": 0 } } @@ -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", @@ -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", @@ -977,7 +977,7 @@ "optional": null }, "scenario_id": { - "required": ["A-2020-11-15"], + "required": ["A-2020-05-01"], "optional": null }, "location": { @@ -1005,7 +1005,7 @@ "samples_joint_across": ["horizon", "race_ethnicity"] }, "value" : { - "type": "double", + "type": "numeric", "minimum": 0 } } @@ -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", @@ -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", @@ -1056,7 +1056,7 @@ "optional": null }, "scenario_id": { - "required": ["A-2020-11-15"], + "required": ["A-2020-05-01"], "optional": null }, "location": { @@ -1083,7 +1083,7 @@ "optional": [0, 1] }, "value" : { - "type": "double", + "type": "numeric", "minimum": 0 } } @@ -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", @@ -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", @@ -1134,7 +1134,7 @@ "optional": null }, "scenario_id": { - "required": ["A-2020-11-15"], + "required": ["A-2020-05-01"], "optional": null }, "location": { @@ -1161,7 +1161,7 @@ "optional": [0, 1] }, "value" : { - "type": "double", + "type": "numeric", "minimum": 0 } } @@ -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", @@ -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",