From db9215b7c5bf1a230fff242a124dca921daa35b3 Mon Sep 17 00:00:00 2001 From: klau506 Date: Mon, 9 Dec 2024 11:07:17 +0100 Subject: [PATCH] ComDef: fix NA and Inf checker --- R/functions.R | 4 ++-- R/main.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/R/functions.R b/R/functions.R index 7ea66641..d8d81d2d 100644 --- a/R/functions.R +++ b/R/functions.R @@ -4377,7 +4377,7 @@ do_bind_results <- function(GCAM_version = "v7.1") { do_check_inf <- function(GCAM_version = "v7.1") { # Check vetting results from SM report_inf_summary <- report %>% - dplyr::filter(dplyr::across(`2005`:last_col(), ~ is.infinite(.))) + dplyr::filter(dplyr::if_any(`2005`:dplyr::last_col(), ~ is.infinite(.))) # output if (nrow(report_inf_summary) == 0) { @@ -4407,7 +4407,7 @@ do_check_inf <- function(GCAM_version = "v7.1") { do_check_na <- function(GCAM_version = "v7.1") { # Check vetting results from SM report_na_summary <- report %>% - dplyr::filter(dplyr::across(`2005`:last_col(), ~ is.na(.))) + dplyr::filter(dplyr::if_any(`2005`:last_col(), ~ is.na(.))) # output if (nrow(report_na_summary) == 0) { diff --git a/R/main.R b/R/main.R index 4f9f3286..1ae326e8 100644 --- a/R/main.R +++ b/R/main.R @@ -819,8 +819,8 @@ generate_report <- function(db_path = NULL, db_name = NULL, prj_name, scenarios } vetting_summary <<- vetting_summary cat("To view the summary details, type:\n") - cat(' - `vetting_summary$`NA variables` to check for NA values\n') cat(' - `vetting_summary$`Inf variables` to check for Inf values\n') + cat(' - `vetting_summary$`NA variables` to check for NA values\n') cat(' - `vetting_summary$`Vetting variables` to check with historical values\n') cat("\nYou can find a supporting vetting figure in: `output/figure/vetting.tiff`\n") cat("==============================================================\n")