From 24d15d5f19eacb787e70df88f46481667627fb62 Mon Sep 17 00:00:00 2001 From: Ricarda Rosemann Date: Fri, 2 Feb 2024 14:42:33 +0100 Subject: [PATCH 1/3] Add pCap FE/UE variables for buildings to plotstyle, adapt computation of label for shortened legend --- R/showAreaAndBarPlots.R | 2 +- inst/extdata/plotstyle.csv | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/R/showAreaAndBarPlots.R b/R/showAreaAndBarPlots.R index a97f9fa..6400361 100644 --- a/R/showAreaAndBarPlots.R +++ b/R/showAreaAndBarPlots.R @@ -119,7 +119,7 @@ showAreaAndBarPlots <- function( ) # Common label for y-axis. - lcp <- if (is.null(tot)) gsub("\\|$", "", attr(shorten_legend(vars, identical_only = TRUE), "front")) else tot + lcp <- if (is.null(tot)) gsub("\\|$", "", attr(shorten_legend(vars, identical_only = TRUE), "front")) else gsub(" pCap$", "", tot) label <- paste0(lcp, " (", paste0(levels(d$unit), collapse = ","), ")") # Create plots. diff --git a/inst/extdata/plotstyle.csv b/inst/extdata/plotstyle.csv index 96d8636..a90a2bd 100644 --- a/inst/extdata/plotstyle.csv +++ b/inst/extdata/plotstyle.csv @@ -389,6 +389,7 @@ Solar|PV;Solar PV;#ffe600;; Electricity;Electricity;#ffb200;; Heat;Heat;#cc0000;; Solids;Solids;#0c0c0c;; +Solids pCap;Solids pCap;#0c0c0c;; Liquids;Liquids;#0000cc;; Liquids pCap;Liquids pCap;#0000cc;; Hydrogen;Hydrogen;#66cccc;; @@ -456,8 +457,19 @@ Heating|District Heating;District heating;#cc0000;; Heating|Electricity|Resistance;Resistive electric heating;#f58231;; Heating|Electricity|Heat pump;Heat pumps;#3cb44b;; Heating|Hydrogen;Hydrogen;#66cccc;; +non-Heating|Electricity|Conventional pCap;non-heating Electricity pCap;#ffb200;; +Heating|Solids pCap;Solids pCap;#191919;; +Heating|Liquids pCap;Liquids pCap;#0000cc;; +Heating|Gases pCap;Gases pCap;#999966;; +Heating|District Heating pCap;District heating pCap;#cc0000;; +Heating|Electricity|Resistance pCap;Resistive electric heating pCap;#f58231;; +Heating|Electricity|Heat pump pCap;Heat pump pCaps;#3cb44b;; +Heating|Hydrogen pCap;Hydrogen pCap;#66cccc +District Heating pCap;District heating pCap;#cc0000;; Electricity|Resistance;Resistive electric heating;#f58231;; Electricity|Heat pump;Heat pumps;#3cb44b;; +Electricity|Resistance pCap;Resistive electric heating pCap;#f58231;; +Electricity|Heat pump pCap;Heat pumps pCap;#3cb44b;; BAU_Nash;BAU Nash;#0c0c0c;; BAU_Nash_l;BAU Nash low;#0c0c0c;; BAU_Nash_m2;BAU Nash m2;#0c0c0c;; From 84687be140d2050e5da8acbfbf16219ab15e2938 Mon Sep 17 00:00:00 2001 From: Ricarda Rosemann Date: Wed, 7 Feb 2024 17:01:02 +0100 Subject: [PATCH 2/3] run buildLibrary --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index de66603..26bf89e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29083776' +ValidationKey: '291045059760' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index bf2a452..6149e0a 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mip: Comparison of multi-model runs' -version: 0.147.2 -date-released: '2024-02-05' +version: 0.147.2.9001 +date-released: '2024-02-07' abstract: Package contains generic functions to produce comparison plots of multi-model runs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index a08fe6c..354f699 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mip Title: Comparison of multi-model runs -Version: 0.147.2 -Date: 2024-02-05 +Version: 0.147.2.9001 +Date: 2024-02-07 Authors@R: c( person("David", "Klein", , "dklein@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/README.md b/README.md index 651f341..9558ff2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Comparison of multi-model runs -R package **mip**, version **0.147.2** +R package **mip**, version **0.147.2.9001** [![CRAN status](https://www.r-pkg.org/badges/version/mip)](https://cran.r-project.org/package=mip) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158586.svg)](https://doi.org/10.5281/zenodo.1158586) [![R build status](https://github.com/pik-piam/mip/workflows/check/badge.svg)](https://github.com/pik-piam/mip/actions) [![codecov](https://codecov.io/gh/pik-piam/mip/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mip) [![r-universe](https://pik-piam.r-universe.dev/badges/mip)](https://pik-piam.r-universe.dev/builds) @@ -47,7 +47,7 @@ In case of questions / problems please contact David Klein , R package version 0.147.2, . +Klein D, Dietrich J, Baumstark L, Humpenoeder F, Stevanovic M, Wirth S, Führlich P, Richters O (2024). _mip: Comparison of multi-model runs_. doi:10.5281/zenodo.1158586 , R package version 0.147.2.9001, . A BibTeX entry for LaTeX users is @@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is title = {mip: Comparison of multi-model runs}, author = {David Klein and Jan Philipp Dietrich and Lavinia Baumstark and Florian Humpenoeder and Miodrag Stevanovic and Stephen Wirth and Pascal Führlich and Oliver Richters}, year = {2024}, - note = {R package version 0.147.2}, + note = {R package version 0.147.2.9001}, doi = {10.5281/zenodo.1158586}, url = {https://github.com/pik-piam/mip}, } From 5b24529abb12890bd68d7a0474cb26acd58769f4 Mon Sep 17 00:00:00 2001 From: Ricarda Rosemann Date: Tue, 13 Feb 2024 11:18:30 +0100 Subject: [PATCH 3/3] Run buildLibrary --- .buildlibrary | 2 +- .pre-commit-config.yaml | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 14 +++----------- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index be92351..69ead32 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29284320' +ValidationKey: '29312978' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f13466..243f46a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: v0.3.2.9025 + rev: v0.4.0 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 3e241d0..a7ca026 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mip: Comparison of multi-model runs' -version: 0.148.2 -date-released: '2024-02-07' +version: 0.148.3 +date-released: '2024-02-13' abstract: Package contains generic functions to produce comparison plots of multi-model runs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 1bfe8df..bd2fe32 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mip Title: Comparison of multi-model runs -Version: 0.148.2 -Date: 2024-02-07 +Version: 0.148.3 +Date: 2024-02-13 Authors@R: c( person("David", "Klein", , "dklein@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/README.md b/README.md index d1691cf..cfec03f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Comparison of multi-model runs -R package **mip**, version **0.148.2** +R package **mip**, version **0.148.3** [![CRAN status](https://www.r-pkg.org/badges/version/mip)](https://cran.r-project.org/package=mip) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158586.svg)](https://doi.org/10.5281/zenodo.1158586) [![R build status](https://github.com/pik-piam/mip/workflows/check/badge.svg)](https://github.com/pik-piam/mip/actions) [![codecov](https://codecov.io/gh/pik-piam/mip/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mip) [![r-universe](https://pik-piam.r-universe.dev/badges/mip)](https://pik-piam.r-universe.dev/builds) @@ -47,11 +47,7 @@ In case of questions / problems please contact David Klein , R package version 0.147.2.9001, . -======= -Klein D, Dietrich J, Baumstark L, Humpenoeder F, Stevanovic M, Wirth S, Führlich P, Richters O (2024). _mip: Comparison of multi-model runs_. doi:10.5281/zenodo.1158586 , R package version 0.148.2, . ->>>>>>> e3cc350d0c48447549e69c934dcb218dd35374d8 +Klein D, Dietrich J, Baumstark L, Humpenoeder F, Stevanovic M, Wirth S, Führlich P, Richters O (2024). _mip: Comparison of multi-model runs_. doi:10.5281/zenodo.1158586 , R package version 0.148.3, . A BibTeX entry for LaTeX users is @@ -60,11 +56,7 @@ A BibTeX entry for LaTeX users is title = {mip: Comparison of multi-model runs}, author = {David Klein and Jan Philipp Dietrich and Lavinia Baumstark and Florian Humpenoeder and Miodrag Stevanovic and Stephen Wirth and Pascal Führlich and Oliver Richters}, year = {2024}, -<<<<<<< HEAD - note = {R package version 0.147.2.9001}, -======= - note = {R package version 0.148.2}, ->>>>>>> e3cc350d0c48447549e69c934dcb218dd35374d8 + note = {R package version 0.148.3}, doi = {10.5281/zenodo.1158586}, url = {https://github.com/pik-piam/mip}, }