From fc09c5d99374dfc62dcd02b78e906dfce51358dd Mon Sep 17 00:00:00 2001 From: Fsioutas Date: Thu, 30 Jul 2026 17:46:12 +0300 Subject: [PATCH 1/2] Add units for passenger transport and update dimension names in reportIndicators --- R/reportIndicators.R | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/R/reportIndicators.R b/R/reportIndicators.R index f1e54dc..88abbd1 100644 --- a/R/reportIndicators.R +++ b/R/reportIndicators.R @@ -22,6 +22,8 @@ reportIndicators <- function(reports, path, regions, years, blabla_regions) { IFullACTV <- calcOutput("IFullACTV", aggregate = TRUE, regionmapping = "regionmappingOPDEV5.csv") IFullACTV <- IFullACTV[blabla_regions, years, ] + unitsPassenger <- getItems(IFullACTV,3) + IFullACTV <- collapseDim(IFullACTV, dim = 3.2) if ("World" %in% regions) { @@ -351,7 +353,13 @@ reportIndicators <- function(reports, path, regions, years, blabla_regions) { ActivPassTrnsp <- TRANP / v01ActivPassTrnsp ActivGoodsTransp <- TRANG / V01ActivGoodsTransp - ActivPassTrnsp <- add_dimension(ActivPassTrnsp, dim = 3.2, add = "unit", nm = "Mtoe/ACTV") + unitsActivPassTrnsp <- paste0("Mtoe/",sub("^[^.]+\\.","",unitsPassenger[ + match(c("PC", "PB", "PT", "PN", "PA"),sub("\\..*", "", unitsPassenger))])) + + ActivPassTrnsp <- mbind( + lapply(seq_along(unitsActivPassTrnsp), function(i) { + add_dimension(ActivPassTrnsp[, , i],dim = 3.2,add = "unit",nm = unitsActivPassTrnsp[i])})) + ActivGoodsTransp <- add_dimension(ActivGoodsTransp, dim = 3.2, add = "unit", nm = "Mtoe/Gtkm") ActivTrnsp <- mbind(ActivPassTrnsp, ActivGoodsTransp) From 574da1d0b04d30627d9b90bb34c460332c1f9763 Mon Sep 17 00:00:00 2001 From: Fsioutas Date: Thu, 30 Jul 2026 18:10:51 +0300 Subject: [PATCH 2/2] Bump version to 0.13.10 in DESCRIPTION file --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 09ee46f..55f240b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: postprom Type: Package Title: A Tool for Comparative Analysis of OPEN-PROM Data -Version: 0.13.9 +Version: 0.13.10 Authors@R: c( person( "Michael", "Madianos",