Merge pull request #39 from USEPA/feature_newScalarTests

Feature new scalar tests
USEPA · Oct 18, 2023 · f28d17b · f28d17b
2 parents 6dfd21f + 8a231be
commit f28d17b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/R/configTests.R b/R/configTests.R
@@ -427,7 +427,7 @@ general_config_test <- function(
     rm("name_i")
   }
   ### Add to return list
-  saveList[["scaledImpactPlots" ]] <- list(data=scaledData, plots=scaledPlots)
+  saveList[["scaledImpactsPlots"]] <- list(data=scaledData, plots=scaledPlots)
   rm("scaledData", "scaledPlots")
   ###### Save Outputs ######
   ### Save the workbook
@@ -651,6 +651,9 @@ make_scaled_impact_plots <- function(
       theme      = NULL
     )
 ){
+  ###### Get from FrEDI Namespace ######
+  addListNames <- utils::getFromNamespace("addListNames", "FrEDI")
+
   ### Other values
   # years      <- c("NA", "2010", "2090")
   years      <- df0[["impactYear"]] |> unique()
@@ -762,6 +765,8 @@ save_scaled_impact_figures <- function(
     units     = "in",
     createDir = TRUE ### Whether to create directory if it doesn't exist
 ){
+  ### Get from FrEDI Namespace
+  check_and_create_path <- utils::getFromNamespace("check_and_create_path", "FrEDI")
   ### Create directory if it doesn't exist
   fdir      <- fpath; rm("fpath")
   fdir      <- fdir |> file.path(byState |> ifelse("images-state", "images"))

diff --git a/R/configTests_utils.R b/R/configTests_utils.R
@@ -118,6 +118,10 @@ get_region_plotInfo <- function(
   ###### Initialize Return List ######
   list0  <- list()
 
+  ###### Get from FrEDI Namespace ######
+  fun_limitsByGroup <- utils::getFromNamespace("fun_limitsByGroup", "FrEDI")
+  get_column_values <- utils::getFromNamespace("get_column_values", "FrEDI")
+
   ###### Grouping Columns ######
   ### Add state to grouping
   if(byState){
@@ -274,6 +278,10 @@ create_scaledImpact_plot <- function(
   print_msg <- !silent
   if(print_msg){ "Running create_scaledImpact_plot()..." |> message()}
 
+  ###### Get from FrEDI Namespace ######
+  get_colScale <- utils::getFromNamespace("get_colScale", "FrEDI")
+  addListNames <- utils::getFromNamespace("addListNames", "FrEDI")
+
   ###### Data ######
   df0        <- data |> filter(sector     == sector0)
   df0        <- df0  |> filter(impactType == impType0)
@@ -518,6 +526,10 @@ create_scaledImpact_plots <- function(
   do_slr    <- "slr" %in% (modelType |> tolower())
   # modelType |> print(); do_gcm |> print(); do_slr |> print()
 
+  ###### Get from FrEDI Namespace ######
+  get_colScale <- utils::getFromNamespace("get_colScale", "FrEDI")
+  addListNames <- utils::getFromNamespace("addListNames", "FrEDI")
+
   ###### Format Data ######
   ### Filter to sector and convert to data frame
   # data |> glimpse()

diff --git a/scripts/configureFrediData.R b/scripts/configureFrediData.R
@@ -57,15 +57,15 @@ list_reshapeData <- list_loadData |> reshapeData(silent=T)
 returnList[["reshapedDataList"]] <- list_reshapeData
 
 ###### 3. Configure Data ######
-list_systemData0 <- list_reshapeData |> createSystemData(save=F, silent=T, outPath= dataOutDir |> file.path("tmp_sysdata.rda"))
+list_systemData0 <- list_reshapeData |> createSystemData(save=save, silent=T, outPath=dataOutDir |> file.path("tmp_sysdata.rda"))
 ### Add to list
 returnList[["systemDataList"]] <- list_systemData0
 
 ###### 4. Run General Tests on Data ######
 test_general_config <- general_config_test(
   reshapedData   = list_reshapeData,
   configuredData = list_systemData0,
-  save           = TRUE,
+  save           = save,
   overwrite      = TRUE,
   xlsxName       = "generalConfig_testResults.xlsx",
   fredi_config   = fredi_config