From e6929c27525a01ce748bd8e331d0457fa62fbcce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20F=C3=BChrlich?= Date: Tue, 16 Jan 2024 11:17:26 +0100 Subject: [PATCH] build --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 6 +++--- NAMESPACE | 2 +- R/harmonize.R | 2 +- README.md | 10 +++++----- man/harmonize.Rd | 6 ++++-- man/mip-package.Rd | 9 +++++++++ 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index ad4077b..3fd52c4 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '28951650' +ValidationKey: '29034598' 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 5ba6247..6b61f9a 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.0 -date-released: '2023-12-04' +version: 0.147.1 +date-released: '2024-01-16' abstract: Package contains generic functions to produce comparison plots of multi-model runs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 79fd123..ebeb466 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mip Title: Comparison of multi-model runs -Version: 0.147.0 -Date: 2023-12-04 +Version: 0.147.1 +Date: 2024-01-16 Authors@R: c( person("David", "Klein", , "dklein@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), @@ -47,4 +47,4 @@ VignetteBuilder: knitr Encoding: UTF-8 LazyData: yes -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 diff --git a/NAMESPACE b/NAMESPACE index bb59d9c..8a6d1ee 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -31,7 +31,7 @@ export(warnMissingVars) import(magclass) import(quitte) importFrom(RColorBrewer,brewer.pal) -importFrom(data.table,`:=`) +importFrom(data.table,":=") importFrom(data.table,as.data.table) importFrom(data.table,data.table) importFrom(data.table,fread) diff --git a/R/harmonize.R b/R/harmonize.R index 25f4774..f5abe43 100644 --- a/R/harmonize.R +++ b/R/harmonize.R @@ -12,7 +12,7 @@ #' @param method harmonization method, currently supported methods are "ratio" and "offset" #' @param suffix to be appended to harmonized variables #' @importFrom dplyr filter mutate -#' @importFrom data.table `:=` +#' @importFrom data.table := #' @export harmonize <- function(df, hist, finalYear = "2050", harmonizeYear = "2015", method = "ratio", suffix = "") { if (!method %in% c("offset", "ratio")) { diff --git a/README.md b/README.md index a6d923f..0725723 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Comparison of multi-model runs -R package **mip**, version **0.147.0** +R package **mip**, version **0.147.1** [![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.0, . +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.1, . A BibTeX entry for LaTeX users is @@ -55,9 +55,9 @@ A BibTeX entry for LaTeX users is @Manual{, 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 = {2023}, - note = {R package version 0.147.0}, - doi = {10.5281/zenodo.1158586}, + year = {2024}, + note = {R package version 0.147.1}, url = {https://github.com/pik-piam/mip}, + doi = {10.5281/zenodo.1158586}, } ``` diff --git a/man/harmonize.Rd b/man/harmonize.Rd index 929a5c1..58453a7 100644 --- a/man/harmonize.Rd +++ b/man/harmonize.Rd @@ -16,9 +16,11 @@ harmonize( ) } \arguments{ -\item{df}{data frame with model data to be harmonized} +\item{df}{data frame with model data to be harmonized, must have the following columns: +variable, region, scenario, model, period} -\item{hist}{data frame with historical data t be used for harmonization} +\item{hist}{data frame with historical data to be used for harmonization, must also have the following columns: +variable, region, scenario, model, period} \item{finalYear}{when should harmonized data match model data again?} diff --git a/man/mip-package.Rd b/man/mip-package.Rd index d846b02..98e5439 100644 --- a/man/mip-package.Rd +++ b/man/mip-package.Rd @@ -12,6 +12,15 @@ Contains the routines for plotting multi model and multi scenario comparisons \tabular{ll}{ Package: \tab mip\cr Type: \tab Package\cr Version: \tab 7.6\cr Date: \tab 2016-06-13\cr License: \tab LGPL-3\cr LazyLoad: \tab yes\cr } +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/pik-piam/mip} + \item \doi{10.5281/zenodo.1158586} + \item Report bugs at \url{https://github.com/pik-piam/mip/issues} +} + } \author{ David Klein