From 4007b9757c64d2ee9ef3575e38978fa8aaafa2d3 Mon Sep 17 00:00:00 2001 From: orichters Date: Thu, 4 Jul 2024 18:46:09 +0200 Subject: [PATCH] fix tax convergence reporting in modelSummary --- scripts/start/modelSummary.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/start/modelSummary.R b/scripts/start/modelSummary.R index 0ba763506..ac0cf6547 100644 --- a/scripts/start/modelSummary.R +++ b/scripts/start/modelSummary.R @@ -98,12 +98,12 @@ modelSummary <- function(folder = ".", gams_runtime = NULL) { message("No failed markets in fulldata.gdx.") } failedtaxes <- quitte::as.quitte(readGDX(file.path(folder, "fulldata.gdx"), "p80_convNashTaxrev_iter")) - failedtaxes <- droplevels(dplyr::filter(failedtaxes, !!rlang::sym("value") == 1)) + failedtaxes <- droplevels(dplyr::filter(failedtaxes, as.numeric(!!rlang::sym("iteration")) == max_iter_fd, abs(!!rlang::sym("value")) > 0.001)) if (nrow(failedtaxes) > 0) { message("Failed tax convergence in fulldata.gdx:") for (r in levels(failedtaxes$region)) { rf <- failedtaxes$period[failedtaxes$region == r] - message(" - ", r, ": ", paste0(rf[1:mif(length(rf), 10)], collapse = ", "), if (length(rf) > 10) " ...") + message(" - ", r, ": ", paste0(rf[1:min(length(rf), 10)], collapse = ", "), if (length(rf) > 10) " ...") } } else { message("No failed tax convergence in fulldata.gdx.")