Merge pull request pik-piam#49 from robinhasse/master

Explicit colours for buildings variables.

.Rbuildignore

@@ -10,3 +10,4 @@
 ^.lintr$
 ^tests/.lintr$
 ^vignettes/.lintr$
+^Makefile$

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '26879684'
+ValidationKey: '27063400'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: '^tests/testthat/_snaps/.*$'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
     -   id: check-case-conflict
     -   id: check-json

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "mip: Comparison of multi-model runs",
-  "version": "0.139.1",
+  "version": "0.140.0",
   "description": "<p>Package contains generic functions to produce comparison\n    plots of multi-model runs.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mip
 Title: Comparison of multi-model runs
-Version: 0.139.1
-Date: 2022-11-28
+Version: 0.140.0
+Date: 2022-12-05
 Authors@R: c(
     person("David", "Klein", , "[email protected]", role = c("aut", "cre")),
     person("Jan Philipp", "Dietrich", , "[email protected]", role = "aut"),
@@ -46,4 +46,4 @@ VignetteBuilder:
     knitr
 Encoding: UTF-8
 LazyData: yes
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.2

Makefile

@@ -0,0 +1,22 @@
+.PHONY: help build check test lint format
+.DEFAULT_GOAL = help
+
+help:           ## Show this help.
+	@sed -e '/##/ !d' -e '/sed/ d' -e 's/^\([^ ]*\) *##\(.*\)/\1^\2/' \
+		$(MAKEFILE_LIST) | column -ts '^'
+
+build:          ## Build the package using lucode2::buildLibrary()
+	Rscript -e 'lucode2::buildLibrary()'
+
+check:          ## Build documentation and vignettes, run testthat tests,
+                ## and check if code etiquette is followed using lucode2::check()
+	Rscript -e 'lucode2::check()'
+
+test:           ## Run testthat tests
+	Rscript -e 'devtools::test(show_report = TRUE)'
+
+lint:           ## Check if code etiquette is followed using lucode2::lint()
+	Rscript -e 'lucode2::lint()'
+
+format:         ## Apply auto-formatting to changed files and lint afterwards
+	Rscript -e 'lucode2::autoFormat()'

README.md

@@ -1,6 +1,6 @@
 # Comparison of multi-model runs
 
-R package **mip**, version **0.139.1**
+R package **mip**, version **0.140.0**
 
 [![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/ui#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 (2022). _mip: Comparison of multi-model runs_. doi: 10.5281/zenodo.1158586 (URL: https://doi.org/10.5281/zenodo.1158586), R package version 0.139.1, <URL: https://github.com/pik-piam/mip>.
+Klein D, Dietrich J, Baumstark L, Humpenoeder F, Stevanovic M, Wirth S, Führlich P (2022). _mip: Comparison of multi-model runs_. doi:10.5281/zenodo.1158586 <https://doi.org/10.5281/zenodo.1158586>, R package version 0.140.0, <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},
   year = {2022},
-  note = {R package version 0.139.1},
+  note = {R package version 0.140.0},
   doi = {10.5281/zenodo.1158586},
   url = {https://github.com/pik-piam/mip},
 }

inst/extdata/plotstyle.csv

@@ -435,6 +435,16 @@ Final Energy|Residential and Commercial|Liquids;Liquids;#0000cc;;
 FE|Residential and Commercial|Liquids;Liquids;#0000cc;;
 Final Energy|Residential and Commercial|Other;Other;#7f7f7f;;
 FE|Residential and Commercial|Other;Other;#7f7f7f;;
+non-Heating|Electricity|Conventional;non-heating Electricity;#ffb200;;
+Heating|Solids;Solids;#191919;;
+Heating|Liquids;Liquids;#0000cc;;
+Heating|Gases;Gases;#999966;;
+Heating|District Heating;District heating;#cc0000;;
+Heating|Electricity|Resistance;Resistive electric heating;#f58231;;
+Heating|Electricity|Heat pump;Heat pumps;#3cb44b;;
+Heating|Hydrogen;Hydrogen;#66cccc;;
+Electricity|Resistance;Resistive electric heating;#f58231;;
+Electricity|Heat pump;Heat pumps;#3cb44b;;
 BAU_Nash;BAU Nash;#0c0c0c;;
 BAU_Nash_l;BAU Nash low;#0c0c0c;;
 BAU_Nash_m2;BAU Nash m2;#0c0c0c;;