Merge pull request #10 from kjsato/main-test

Main test
HopkinsIDD · Mar 25, 2024 · ffde579 · ffde579
2 parents 771a1c9 + 7c95477
commit ffde579
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 9 deletions.
diff --git a/hub-config/tasks.json b/hub-config/tasks.json
@@ -141,14 +141,138 @@
                        "time_unit": "week"
                     }
                 ]
-
-		    }
-		    ],
-       	    "submissions_due": {
-                "relative_to": "origin_date",
-                "start": -6,
-                "end": 100
+		    },
+		    {
+                "task_ids": {
+                 "origin_date": {
+                     "required": null,
+                     "optional": [
+                         "2023-11-12", "2023-11-19", "2023-11-26", "2023-12-03",
+                         "2023-12-10", "2023-12-17", "2023-12-24", "2023-12-31",
+                         "2024-01-07", "2024-01-14", "2024-01-21", "2024-01-28",
+                         "2024-02-05", "2024-02-11", "2024-02-18", "2024-02-25",
+                         "2024-03-03", "2024-03-10", "2024-03-17", "2024-03-24",
+                         "2024-03-31", "2024-04-07", "2024-04-14", "2024-04-21",
+                         "2024-04-28", "2024-05-05", "2024-05-12"
+                         ]
+                 },
+                 "target": {
+                     "required": null,
+                     "optional": ["inc hosp", "cum hosp"]
+                 },
+                 "horizon": {
+                     "required": [1, 2, 3, 4],
+                     "optional": [0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29]
+                 },
+                 "location": {
+                     "required": null,
+                     "optional": [
+                             "US",
+                             "01",
+                             "02",
+                             "04",
+                             "05",
+                             "06",
+                             "08",
+                             "09",
+                             "10",
+                             "11",
+                             "12",
+                             "13",
+                             "15",
+                             "16",
+                             "17",
+                             "18",
+                             "19",
+                             "20",
+                             "21",
+                             "22",
+                             "23",
+                             "24",
+                             "25",
+                             "26",
+                             "27",
+                             "28",
+                             "29",
+                             "30",
+                             "31",
+                             "32",
+                             "33",
+                             "34",
+                             "35",
+                             "36",
+                             "37",
+                             "38",
+                             "39",
+                             "40",
+                             "41",
+                             "42",
+                             "44",
+                             "45",
+                             "46",
+                             "47",
+                             "48",
+                             "49",
+                             "50",
+                             "51",
+                             "53",
+                             "54",
+                             "55",
+                             "56",
+                             "72",
+                             "78"
+                         ]
+                 },
+                 "age_group":{
+                     "required":["0-130"],
+                     "optional":["0-0.99","1-4","5-17","5-64","18-49","50-64","65-130"]
+                 }
+                },
+                "output_type": {
+                    "sample":{
+                        "output_type_id":{
+                            "required": null,
+                            "optional":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100]
+                        },
+                        "value":{
+                        "type":"double",
+                        "minimum":0
+                        }
+                    }
+                },
+                "target_metadata": [
+                 {
+                    "target_id": "inc hosp",
+                    "target_name": "Weekly incident RSV hospitalizations",
+                    "target_units": "count",
+                    "target_keys": {
+                        "target": ["inc hosp"]
+                    },
+                    "target_type": "discrete",
+                    "is_step_ahead": true,
+                    "time_unit": "week"
+                 },
+                 {
+                    "target_id": "cum hosp",
+                    "target_name":"Weekly incident cumulative RSV hospitalizations",
+                    "target_units":"count",
+                    "target_keys":{
+                        "target":["cum hosp"]
+                    },
+                    "target_type": "discrete",
+                    "is_step_ahead": true,
+                    "time_unit": "week"
+                 }
+                ]
             }
+
+
+		],
+       	"submissions_due": {
+            "relative_to": "origin_date",
+            "start": -6,
+            "end": 100
         }
+    }
     ]
 }
diff --git a/scripts/ensemble.R b/scripts/ensemble.R
@@ -16,13 +16,13 @@ library(purrr)
 
 ## ----setup_specifics, include=FALSE---------------------------------------------------
 
-dates_archive <- unlist(jsonlite::read_json(file.path(dir_path, "hub-config/tasks.json"))$rounds[[1]]$model_tasks[[1]]$task_ids$origin_date$optional)
+dates_archive <- unlist(jsonlite::read_json(file.path(local_path, "../hub-config/tasks.json"))$rounds[[1]]$model_tasks[[1]]$task_ids$origin_date$optional)
 dates_archive <- dates_archive[as.Date(dates_archive) <= Sys.Date()]
 
 curr_origin_date <- as.Date(max(dates_archive, na.rm = TRUE))
 
 ## ----prep_ens, include=FALSE--------------------------------------------------
-hub_path <- file.path(local_path, "rsv-forecast-hub-kjsato/")
+hub_path <- file.path(local_path, "../hub-config")
 hub_con <- connect_hub(hub_path)
 
 ## ----load_data, include=FALSE--------------------------------------------------