From da9f48da175b7393a64236979bcbc1474421e2a9 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Tue, 11 Jun 2024 16:31:46 +0200 Subject: [PATCH] increment version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- NAMESPACE | 4 ++++ R/calcIEAfloorspace.R | 2 +- R/calcUvalues.R | 5 +++-- R/readEUBuildingsObservatory.R | 4 ++-- README.md | 6 +++--- man/calcIEAfloorspace.Rd | 11 +++++++++++ man/calcUvalues.Rd | 14 ++++++++++++++ man/readETSAP.Rd | 11 +++++++++++ man/readEUBuildingsObservatory.Rd | 13 +++++++++++++ 12 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 man/calcIEAfloorspace.Rd create mode 100644 man/calcUvalues.Rd create mode 100644 man/readETSAP.Rd create mode 100644 man/readEUBuildingsObservatory.Rd diff --git a/.buildlibrary b/.buildlibrary index ebd3fda..04e14ee 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '1210118' +ValidationKey: '1232870' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 036124d..f6153b6 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: 'mredgebuildings: Prepare data to be used by the EDGE-Buildings model' -version: 0.6.1 -date-released: '2024-04-25' +version: 0.6.2 +date-released: '2024-06-11' abstract: Prepare data to be used by the EDGE-Buildings model. authors: - family-names: Hasse diff --git a/DESCRIPTION b/DESCRIPTION index 272df42..5ea6627 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mredgebuildings Title: Prepare data to be used by the EDGE-Buildings model -Version: 0.6.1 -Date: 2024-04-25 +Version: 0.6.2 +Date: 2024-06-11 Authors@R: c( person("Robin", "Hasse", , "robin.hasse@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-1818-3186")), diff --git a/NAMESPACE b/NAMESPACE index c5976cd..d1121d3 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -11,6 +11,7 @@ export(calcHeatingCapacity) export(calcHeatingSystem) export(calcHouseholdSize) export(calcIEAPFU) +export(calcIEAfloorspace) export(calcLifetimeParams) export(calcMatchingReference) export(calcPopulationBuildings) @@ -21,6 +22,7 @@ export(calcSharesBuildingDemand) export(calcSurface) export(calcUEdemand) export(calcUValue) +export(calcUvalues) export(convertCensusHub) export(convertDaioglou) export(convertDeetman2020) @@ -42,7 +44,9 @@ export(readDeetman2020) export(readECEMF) export(readEEAfloorspace) export(readEHI) +export(readETSAP) export(readEUBuildingsDB) +export(readEUBuildingsObservatory) export(readEnergiforsk2016) export(readEurObservER) export(readEuropeanCommissionRenovation) diff --git a/R/calcIEAfloorspace.R b/R/calcIEAfloorspace.R index be5da68..82bf97a 100644 --- a/R/calcIEAfloorspace.R +++ b/R/calcIEAfloorspace.R @@ -3,7 +3,7 @@ #' @export calcIEAfloorspace <- function() { - x <- readSource("IEAfloorspace", convert = F) + x <- readSource("IEAfloorspace", convert = FALSE) return(list( x = x, diff --git a/R/calcUvalues.R b/R/calcUvalues.R index 0ceead4..52bb2ca 100644 --- a/R/calcUvalues.R +++ b/R/calcUvalues.R @@ -1,5 +1,6 @@ #' Calculate U-value #' +#' @param subtype either 'EUBuildingsObservatory' or 'ETSAP' #' @export calcUvalues <- function(subtype) { @@ -8,10 +9,10 @@ calcUvalues <- function(subtype) { } if (subtype == "EUBuildingsObservatory") { - x <- readSource("EUBuildingsObservatory", convert = F) + x <- readSource("EUBuildingsObservatory", convert = FALSE) unit <- "W/m2C" } else { - x <- readSource("ETSAP", convert = F) + x <- readSource("ETSAP", convert = FALSE) unit <- "W/m2K" } diff --git a/R/readEUBuildingsObservatory.R b/R/readEUBuildingsObservatory.R index 0c953b2..c5780bc 100644 --- a/R/readEUBuildingsObservatory.R +++ b/R/readEUBuildingsObservatory.R @@ -5,11 +5,11 @@ readEUBuildingsObservatory <- function() { res <- read.csv2(file.path("2017", "Uvalues_Res_export-eu-buildings-20170503115017.csv"), - na.strings = "-", sep = ",", comment.char = "#", stringsAsFactors = F) %>% + na.strings = "-", sep = ",", comment.char = "#", stringsAsFactors = FALSE) %>% mutate("variable" = "uvalue_res") com <- read.csv2(file.path("2017", "Uvalues_NonRes_export-eu-buildings-20170503115017.csv"), - na.strings = "-", sep = ",", comment.char = "#", stringsAsFactors = F) %>% + na.strings = "-", sep = ",", comment.char = "#", stringsAsFactors = FALSE) %>% mutate("variable" = "uvalue_com") data <- rbind(res, com) diff --git a/README.md b/README.md index e84ccc9..cff18e7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare data to be used by the EDGE-Buildings model -R package **mredgebuildings**, version **0.6.1** +R package **mredgebuildings**, version **0.6.2** [![CRAN status](https://www.r-pkg.org/badges/version/mredgebuildings)](https://cran.r-project.org/package=mredgebuildings) [![R build status](https://github.com/pik-piam/mredgebuildings/workflows/check/badge.svg)](https://github.com/pik-piam/mredgebuildings/actions) [![codecov](https://codecov.io/gh/pik-piam/mredgebuildings/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mredgebuildings) [![r-universe](https://pik-piam.r-universe.dev/badges/mredgebuildings)](https://pik-piam.r-universe.dev/builds) @@ -38,7 +38,7 @@ In case of questions / problems please contact Robin Hasse . +Hasse R, Führlich P, Levesque A, Tockhorn H (2024). _mredgebuildings: Prepare data to be used by the EDGE-Buildings model_. R package version 0.6.2, . A BibTeX entry for LaTeX users is @@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is title = {mredgebuildings: Prepare data to be used by the EDGE-Buildings model}, author = {Robin Hasse and Pascal Führlich and Antoine Levesque and Hagen Tockhorn}, year = {2024}, - note = {R package version 0.6.1}, + note = {R package version 0.6.2}, url = {https://github.com/pik-piam/mredgebuildings}, } ``` diff --git a/man/calcIEAfloorspace.Rd b/man/calcIEAfloorspace.Rd new file mode 100644 index 0000000..a831421 --- /dev/null +++ b/man/calcIEAfloorspace.Rd @@ -0,0 +1,11 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/calcIEAfloorspace.R +\name{calcIEAfloorspace} +\alias{calcIEAfloorspace} +\title{floor space by subsectors} +\usage{ +calcIEAfloorspace() +} +\description{ +floor space by subsectors +} diff --git a/man/calcUvalues.Rd b/man/calcUvalues.Rd new file mode 100644 index 0000000..16e5704 --- /dev/null +++ b/man/calcUvalues.Rd @@ -0,0 +1,14 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/calcUvalues.R +\name{calcUvalues} +\alias{calcUvalues} +\title{Calculate U-value} +\usage{ +calcUvalues(subtype) +} +\arguments{ +\item{subtype}{either 'EUBuildingsObservatory' or 'ETSAP'} +} +\description{ +Calculate U-value +} diff --git a/man/readETSAP.Rd b/man/readETSAP.Rd new file mode 100644 index 0000000..ac367d4 --- /dev/null +++ b/man/readETSAP.Rd @@ -0,0 +1,11 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/readETSAP.R +\name{readETSAP} +\alias{readETSAP} +\title{Read in energy efficiency values from ETSAP} +\usage{ +readETSAP() +} +\description{ +Read in energy efficiency values from ETSAP +} diff --git a/man/readEUBuildingsObservatory.Rd b/man/readEUBuildingsObservatory.Rd new file mode 100644 index 0000000..e9f823f --- /dev/null +++ b/man/readEUBuildingsObservatory.Rd @@ -0,0 +1,13 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/readEUBuildingsObservatory.R +\name{readEUBuildingsObservatory} +\alias{readEUBuildingsObservatory} +\title{Read in energy efficiency values of building shell in residential and +non-residential buildings by the EU Buildings Observatory (2017)} +\usage{ +readEUBuildingsObservatory() +} +\description{ +Read in energy efficiency values of building shell in residential and +non-residential buildings by the EU Buildings Observatory (2017) +}