Merge pull request #87 from ricardarosemann/adapt-to-pCap-buildings

Enable proper coloring of new per Capita plots for buildings

.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'

.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

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:

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", , "[email protected]", role = c("aut", "cre")),
     person("Jan Philipp", "Dietrich", , "[email protected]", role = "aut"),

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.

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,7 +47,7 @@ In case of questions / problems please contact David Klein <[email protected]
 
 To cite package **mip** in publications use:
 
-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 <https://doi.org/10.5281/zenodo.1158586>, R package version 0.148.2, <https://github.com/pik-piam/mip>.
+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 <https://doi.org/10.5281/zenodo.1158586>, R package version 0.148.3, <https://github.com/pik-piam/mip>.
 
 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.148.2},
+  note = {R package version 0.148.3},
   doi = {10.5281/zenodo.1158586},
   url = {https://github.com/pik-piam/mip},
 }

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;;