remove duplicate files

CDCgov · Jun 5, 2024 · ad5f6f3 · ad5f6f3
1 parent 1d17a8b
commit ad5f6f3
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/command_line_eval_hosp.R → pipeline/command_line_eval_fit_hosp.R b/command_line_eval_hosp.R → pipeline/command_line_eval_fit_hosp.R
@@ -12,12 +12,10 @@ parsed_args <- arg_parser("Run eval pipeline for one config") |>
   add_argument("config_index", help = "index of entry in eval_config to use", type = "integer") |>
   add_argument("eval_config_path", help = "path to eval_config.yaml") |>
   add_argument("params_path", help = "path to params.toml") |>
-  add_argument("output_dir", help = "directory to store output") |>
   parse_args()
 
 eval_fit_hosp(
   config_index = parsed_args$config_index,
   eval_config_path = parsed_args$eval_config_path,
-  params_path = parsed_args$params_path,
-  output_dir = parsed_args$output_dir
+  params_path = parsed_args$params_path
 )
diff --git a/command_line_eval_ww.R → pipeline/command_line_eval_fit_ww.R b/command_line_eval_ww.R → pipeline/command_line_eval_fit_ww.R
@@ -12,12 +12,10 @@ parsed_args <- arg_parser("Run eval pipeline for one config") |>
   add_argument("config_index", help = "index of entry in eval_config to use", type = "integer") |>
   add_argument("eval_config_path", help = "path to eval_config.yaml") |>
   add_argument("params_path", help = "path to params.toml") |>
-  add_argument("output_dir", help = "directory to store output") |>
   parse_args()
 
 eval_fit_ww(
   config_index = parsed_args$config_index,
   eval_config_path = parsed_args$eval_config_path,
-  params_path = parsed_args$params_path,
-  output_dir = parsed_args$output_dir
+  params_path = parsed_args$params_path
 )
diff --git a/pipeline/command_line_eval_post_process_hosp.R b/pipeline/command_line_eval_post_process_hosp.R
@@ -0,0 +1,21 @@
+library(argparser, quietly = TRUE)
+library(cfaforecastrenewalww)
+library(wweval)
+library(ggplot2)
+## some functions from plots.R complain about aes()
+## function not existing if we don't load ggplot2
+
+options(mc.cores = 4)
+
+# Command Line Version ------------------------------------------------------------------------
+parsed_args <- arg_parser("Run eval pipeline for one config") |>
+  add_argument("config_index", help = "index of entry in eval_config to use", type = "integer") |>
+  add_argument("eval_config_path", help = "path to eval_config.yaml") |>
+  add_argument("params_path", help = "path to params.toml") |>
+  parse_args()
+
+eval_post_process_hosp(
+  config_index = parsed_args$config_index,
+  eval_config_path = parsed_args$eval_config_path,
+  params_path = parsed_args$params_path
+)
diff --git a/pipeline/command_line_eval_post_process_ww.R b/pipeline/command_line_eval_post_process_ww.R
@@ -0,0 +1,21 @@
+library(argparser, quietly = TRUE)
+library(cfaforecastrenewalww)
+library(wweval)
+library(ggplot2)
+## some functions from plots.R complain about aes()
+## function not existing if we don't load ggplot2
+
+options(mc.cores = 4)
+
+# Command Line Version ------------------------------------------------------------------------
+parsed_args <- arg_parser("Run eval pipeline for one config") |>
+  add_argument("config_index", help = "index of entry in eval_config to use", type = "integer") |>
+  add_argument("eval_config_path", help = "path to eval_config.yaml") |>
+  add_argument("params_path", help = "path to params.toml") |>
+  parse_args()
+
+eval_post_process_ww(
+  config_index = parsed_args$config_index,
+  eval_config_path = parsed_args$eval_config_path,
+  params_path = parsed_args$params_path
+)