increment version

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '1210118'
+ValidationKey: '1232870'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

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

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", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1818-3186")),

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)

R/calcIEAfloorspace.R

@@ -3,7 +3,7 @@
 #' @export
 calcIEAfloorspace <- function() {
 
-  x <- readSource("IEAfloorspace", convert = F)
+  x <- readSource("IEAfloorspace", convert = FALSE)
 
   return(list(
     x = x,

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"
   }
 

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)

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 <robin.hasse@pik-pots
 
 To cite package **mredgebuildings** in publications use:
 
-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.1, <https://github.com/pik-piam/mredgebuildings>.
+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, <https://github.com/pik-piam/mredgebuildings>.
 
 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},
 }
 ```