diff --git a/DESCRIPTION b/DESCRIPTION index 6c19611..12e7e46 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: mip Type: Package Title: Comparison of multi-model runs -Version: 0.97.2 -Date: 2017-09-29 +Version: 0.97.3 +Date: 2017-10-06 Author: David Klein, Benjamin Leon Bodirsky, Florian Humpenoeder, Lavinia Baumstark, Jerome Hilaire Maintainer: David Klein Description: Package contains generic functions to produce comparison plots of multi-model runs. diff --git a/R/validationpdf.R b/R/validationpdf.R index 735817a..121321a 100644 --- a/R/validationpdf.R +++ b/R/validationpdf.R @@ -63,17 +63,17 @@ validationpdf <- function(x,hist,file="validation.pdf",style="comparison", only_ x$fullname <- paste0(x$variable, " (",x$unit,")") hist$fullname <- paste0(hist$variable, " (",hist$unit,")") - #vars <- intersect(x$fullname,hist$fullname) vars <- x$fullname - xtrax <- setdiff(x$fullname,hist$fullname) - xtrahist <- setdiff(hist$fullname,x$fullname) - + remove_symbols <- function(x) return(gsub("(\\++|\\-+)\\|","", x)) extract_symbols <- function(x) return(gsub("(\\+|\\-)\\|","\\1",gsub("[^\\|^\\+^\\-]*","",x))) x$fullname <- as.factor(remove_symbols(x$fullname)) hist$fullname <- as.factor(remove_symbols(hist$fullname)) + xtrax <- setdiff(x$fullname,hist$fullname) + xtrahist <- setdiff(hist$fullname,x$fullname) + x$variable <- remove_symbols(x$variable) hist$variable <- remove_symbols(hist$variable)