diff --git a/.buildlibrary b/.buildlibrary index fb1a42b..a78411a 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '739445' +ValidationKey: '801840' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' @@ -11,3 +11,4 @@ AcceptedNotes: - Non-standard file/directory found at top level: output allowLinterWarnings: yes enforceVersionUpdate: no +skipCoverage: no diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index f6ea5d4..d85a316 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,14 +23,14 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | - any::lucode2 - any::covr - any::madrat - any::magclass - any::citation - any::gms - any::goxygen - any::GDPuc + lucode2 + covr + madrat + magclass + citation + gms + goxygen + GDPuc # piam packages also available on CRAN (madrat, magclass, citation, # gms, goxygen, GDPuc) will usually have an outdated binary version # available; by using extra-packages we get the newest version @@ -63,6 +63,6 @@ jobs: shell: Rscript {0} run: | nonDummyTests <- setdiff(list.files("./tests/testthat/"), c("test-dummy.R", "_snaps")) - if(length(nonDummyTests) > 0) covr::codecov(quiet = FALSE) + if(length(nonDummyTests) > 0 && !lucode2:::loadBuildLibraryConfig()[["skipCoverage"]]) covr::codecov(quiet = FALSE) env: NOT_CRAN: "true" diff --git a/CITATION.cff b/CITATION.cff index 5199b96..58abbff 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: 'piamValidation: Validation Tools for PIK-PIAM' -version: 0.3.7 -date-released: '2024-09-19' +version: 0.4.0 +date-released: '2024-11-19' abstract: The piamValidation package provides validation tools for the Potsdam Integrated Assessment Modelling environment. authors: diff --git a/DESCRIPTION b/DESCRIPTION index a6728fd..73bb9ec 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: piamValidation Title: Validation Tools for PIK-PIAM -Version: 0.3.7 -Date: 2024-09-19 +Version: 0.4.0 +Date: 2024-11-19 Authors@R: c(person("Pascal", "Weigmann",, "pascal.weigmann@pik-potsdam.de", role = c("aut", "cre")), person("Oliver", "Richters",, role = "aut")) diff --git a/NAMESPACE b/NAMESPACE index d5c58bc..e481223 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -19,7 +19,6 @@ importFrom(dplyr,ungroup) importFrom(ggthemes,theme_tufte) importFrom(piamInterfaces,areUnitsIdentical) importFrom(piamutils,getSystemFile) -importFrom(plotly,ggplotly) importFrom(readxl,excel_sheets) importFrom(readxl,read_excel) importFrom(utils,read.csv2) diff --git a/README.md b/README.md index 9cb0d88..c698652 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Validation Tools for PIK-PIAM -R package **piamValidation**, version **0.3.7** +R package **piamValidation**, version **0.4.0** [![CRAN status](https://www.r-pkg.org/badges/version/piamValidation)](https://cran.r-project.org/package=piamValidation) [![R build status](https://github.com/pik-piam/piamValidation/workflows/check/badge.svg)](https://github.com/pik-piam/piamValidation/actions) [![codecov](https://codecov.io/gh/pik-piam/piamValidation/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/piamValidation) [![r-universe](https://pik-piam.r-universe.dev/badges/piamValidation)](https://pik-piam.r-universe.dev/builds) @@ -46,7 +46,7 @@ In case of questions / problems please contact Pascal Weigmann . +Weigmann P, Richters O (2024). _piamValidation: Validation Tools for PIK-PIAM_. R package version 0.4.0, . A BibTeX entry for LaTeX users is @@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is title = {piamValidation: Validation Tools for PIK-PIAM}, author = {Pascal Weigmann and Oliver Richters}, year = {2024}, - note = {R package version 0.3.7}, + note = {R package version 0.4.0}, url = {https://github.com/pik-piam/piamValidation}, } ``` diff --git a/man/validationHeatmap.Rd b/man/validationHeatmap.Rd index 7c58ab5..0519ea2 100644 --- a/man/validationHeatmap.Rd +++ b/man/validationHeatmap.Rd @@ -1,19 +1,9 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/summaryHeatmap.R, R/validationHeatmap.R +% Please edit documentation in R/validationHeatmap.R \name{validationHeatmap} \alias{validationHeatmap} -\title{takes the output of "validateScenarios()" and plots heatmaps per variable} +\title{takes the output of "validateScenarios()" and plots heat maps per variable} \usage{ -validationHeatmap( - df, - main_dim = "variable", - x_plot = NULL, - y_plot = NULL, - x_facet = NULL, - y_facet = NULL, - interactive = TRUE -) - validationHeatmap( df, main_dim = "variable", @@ -42,16 +32,7 @@ is NULL, arrangement is chosen automatically based on data dimensions} \item{y_facet}{choose dimension to display on x-dim of facets} \item{interactive}{return plots as interactive plotly plots by default} - -\item{var}{variable to be plotted} - -\item{met}{choose metric from "relative", "difference", "absolute" or -"growthrate"} - -\item{historical}{should this be a plot comparing to historical data} } \description{ -takes the output of "validateScenarios()" and plots heatmaps per variable - takes the output of "validateScenarios()" and plots heat maps per variable }