Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 9 additions & 1 deletion R/reportIndicators.R
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down