Merge pull request #16 from robinhasse/main

Matching references

.buildlibrary

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

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
     -   id: mixed-line-ending
 
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9007
+    rev: v0.3.2.9013
     hooks:
     -   id: parsable-R
     -   id: deps-in-desc

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.2.2
-date-released: '2023-06-07'
+version: 0.3.0
+date-released: '2023-06-29'
 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.2.2
-Date: 2023-06-07
+Version: 0.3.0
+Date: 2023-06-29
 Authors@R: c(
     person("Robin", "Hasse", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1818-3186")),

Makefile

@@ -11,8 +11,9 @@ HELP_PARSING = 'm <- readLines("Makefile");\
 help:           ## Show this help.
 	@Rscript -e $(HELP_PARSING)
 
-build:          ## Build the package using lucode2::buildLibrary().
-	Rscript -e 'lucode2::buildLibrary()'
+build:          ## Build the package using lucode2::buildLibrary(). You can pass the
+                ## updateType with 'make build u=3'
+	Rscript -e 'lucode2::buildLibrary(updateType = "$(u)")'
 
 check:          ## Build documentation and vignettes, run testthat tests,
                 ## and check if code etiquette is followed using lucode2::check().

NAMESPACE

@@ -5,6 +5,7 @@ export(calcFloorspacePast)
 export(calcHDDCDD)
 export(calcHouseholdSize)
 export(calcIEAPFU)
+export(calcMatchingReference)
 export(calcRenovationAlternatives)
 export(calcShareETP)
 export(calcShareOdyssee)
@@ -14,6 +15,7 @@ export(convertCensusHub)
 export(convertDaioglou)
 export(convertEEAfloorspace)
 export(convertEUBuildingsDB)
+export(convertEnergiforsk2016)
 export(convertEurObservER)
 export(convertEuropeanCommissionRenovation)
 export(convertEurostatBuildings)
@@ -28,6 +30,7 @@ export(readDaioglou)
 export(readEEAfloorspace)
 export(readEHI)
 export(readEUBuildingsDB)
+export(readEnergiforsk2016)
 export(readEurObservER)
 export(readEuropeanCommissionRenovation)
 export(readEurostatBuildings)
@@ -43,6 +46,7 @@ import(magclass)
 import(mrcommons)
 import(mrdrivers)
 importFrom(dplyr,"%>%")
+importFrom(dplyr,.data)
 importFrom(dplyr,across)
 importFrom(dplyr,all_of)
 importFrom(dplyr,anti_join)
@@ -111,6 +115,7 @@ importFrom(stats,predict)
 importFrom(stats,pweibull)
 importFrom(tidyr,complete)
 importFrom(tidyr,gather)
+importFrom(tidyr,pivot_longer)
 importFrom(tidyr,replace_na)
 importFrom(tidyr,separate)
 importFrom(tidyr,spread)

R/calcBuildingStock.R

@@ -726,7 +726,8 @@ calcBuildingStock <- function(subtype = c("residential", "commercial")) {
         group_by(across(all_of(c("region", "period")))) %>%
         mutate(value = proportions(.data[["value"]]))
       stock <- stock %>%
-        left_join(heatingShares, by = c("region", "period")) %>%
+        left_join(heatingShares, by = c("region", "period"),
+                  relationship = "many-to-many") %>%
         mutate(value = .data[["value.x"]] * .data[["value.y"]]) %>%
         select(-"value.x", -"value.y") %>%
         rename(heating = "carrier")