From 8a358d4343da1ddfedf7f91904587d0b1fce878a Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 15 Dec 2023 15:03:11 +0100 Subject: [PATCH] increment version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- inst/markdown/nashAnalysis.Rmd | 37 ++++++++++++++++++++++++---------- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 67c0a7b9..58df726e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '222064080' +ValidationKey: '222106326' 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 df1b9334..cc29c46e 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.127.0 -date-released: '2023-12-13' +version: 1.127.1 +date-released: '2023-12-15' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 66daa0bc..301f0d7d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.127.0 -Date: 2023-12-13 +Version: 1.127.1 +Date: 2023-12-15 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index ca6c86cc..90cfe50c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.127.0** +R package **remind2**, version **1.127.1** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.127.1, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann}, year = {2023}, - note = {R package version 1.127.0}, + note = {R package version 1.127.1}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/inst/markdown/nashAnalysis.Rmd b/inst/markdown/nashAnalysis.Rmd index 16d2b118..b2fe2b2e 100644 --- a/inst/markdown/nashAnalysis.Rmd +++ b/inst/markdown/nashAnalysis.Rmd @@ -91,7 +91,10 @@ p <- mip::mipIterations( xAxis = "iteration", facets = "tall", color = NULL, slider = NULL ) -print(p) +for (i in p) { + print(i) +} + ``` @@ -146,7 +149,9 @@ p <- mip::mipIterations( facetScales = "free_y" ) -print(p) +for (i in p) { + print(i) +} ``` ## price not discounted @@ -204,7 +209,9 @@ p <- mip::mipIterations( facetScales = "free_y" ) -print(p) +for (i in p) { + print(i) +} ``` ## prices and surplus in one plot @@ -266,9 +273,7 @@ for (v in unique(prices_and_surplus_steps$all_enty)) { } ``` - ### x: time, slider: iter, facet: var + all_enty - ```{r results = "asis"} df <- prices_and_surplus_steps %>% @@ -331,7 +336,8 @@ for (v in unique(prices_and_surplus_scaled$all_enty)) { lapply(p, function(plot) { plot <- plot + ggplot2::scale_y_continuous("p80_surplus", sec.axis = - ggplot2::sec_axis(~ . / scale_factor, name = "p80_pvp_itr_no_discount")) + ggplot2::sec_axis(~ . / scale_factor, name = "p80_pvp_itr_no_discount")) + + theme(legend.position = "bottom") print(plot) }) } @@ -389,7 +395,7 @@ plots <- p[[1]] + ggplot2::scale_y_log10(limits = c(1e-4, 1e+1)) plots <- list(plots) plots <- lapply(plots, plotly::ggplotly) %>% adjustSliderAnimation() -print(htmltools::tagList(plots)) +htmltools::tagList(plots) ``` @@ -402,11 +408,14 @@ df <- mip::getPlotData("p80_PriceChangePriceAnticipReg", params$gdx) %>% mutate(ttot := as.numeric(ttot)) %>% select(-"iteration") -mip::mipIterations( +plots <- mip::mipIterations( plotData = df, returnGgplots = TRUE, xAxis = "ttot", facets = "all_regi", color = "all_enty", slider = NULL, facetScales = "free_y" ) + +plots[[1]] + ``` ### p80_DevPriceAnticipReg @@ -418,11 +427,13 @@ df <- mip::getPlotData("p80_DevPriceAnticipReg", params$gdx) %>% mutate(ttot := as.numeric(ttot)) %>% select(-"iteration") -mip::mipIterations( +plots <- mip::mipIterations( plotData = df, returnGgplots = TRUE, xAxis = "ttot", facets = "all_regi", color = "all_enty", slider = NULL, facetScales = "free_y" ) + +plots[[1]] ``` ### p80_DevPriceAnticipGlob @@ -448,18 +459,22 @@ df.allmax <- mip::getPlotData("p80_DevPriceAnticipGlobAllMax", params$gdx) %>% df <- rbind(df, df.all, df.allmax) -mip::mipIterations( +plots <- mip::mipIterations( plotData = df, returnGgplots = TRUE, xAxis = "ttot", facets = "all_enty", color = NULL, slider = NULL, facetScales = "free_y" ) +plots[[1]] + df.max <- mip::getPlotData("p80_DevPriceAnticipGlobMax", params$gdx) %>% select(-"iteration") -mip::mipIterations( +plots <- mip::mipIterations( plotData = df.max, returnGgplots = TRUE, xAxis = "ttot", facets = "all_enty", color = NULL, slider = NULL, facetScales = "free_y" ) + +plots[[1]] ```