Merge pull request #47 from robinhasse/rmZeroWeights

Use new mrremind to avoid zeros from IEA_ETP
pik-piam · Nov 22, 2024 · a982221 · a982221
2 parents 45f92e7 + f3aa313
commit a982221
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '1523420'
+ValidationKey: '1543619'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

diff --git 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.7.6
-date-released: '2024-11-18'
+version: 0.7.7
+date-released: '2024-11-20'
 abstract: Prepare data to be used by the EDGE-Buildings model.
 authors:
 - family-names: Hasse

diff --git 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.7.6
-Date: 2024-11-18
+Version: 0.7.7
+Date: 2024-11-20
 Authors@R: c(
     person("Robin", "Hasse", , "robin.hasse@pik-potsdam.de", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1818-3186")),
@@ -18,7 +18,7 @@ Depends:
     magclass (>= 6.11.0),
     mrdrivers (>= 1.0.0),
     mrcommons (>= 1.35.0),
-    mrremind (>= 0.175.4)
+    mrremind (>= 0.199.1)
 Imports:
     brick (>= 0.5.0),
     dplyr,

diff --git a/R/calcShares.R b/R/calcShares.R
@@ -69,7 +69,7 @@ calcShares <- function(subtype = c("carrier_nonthermal",
 
   # READ-IN DATA ---------------------------------------------------------------
 
-  #--- Main Datasets
+  ## Main Datasets ====
 
   # Shares
 
@@ -177,6 +177,7 @@ calcShares <- function(subtype = c("carrier_nonthermal",
   }
 
 
+
   # PROCESS DATA ---------------------------------------------------------------
 
   # Adjust ETP Mapping
@@ -237,8 +238,7 @@ calcShares <- function(subtype = c("carrier_nonthermal",
     if (feOnly) {
       data  <- feETPfull
     } else {
-      regFE <- feETPfull %>%
-        mutate(value = replace_na(.data[["value"]], 0))
+      regFE <- feETPfull
     }
   }
 

diff --git a/R/readDaioglou.R b/R/readDaioglou.R
@@ -91,6 +91,8 @@ readDaioglou <- function(subtype = "households.specific floor space") {
       mutate(population = asNum(.data[["population"]]),
              `population density` = asNum(.data[["population density"]]),
              `household expenditure` = asNum(.data[["household expenditure"]]),
+             # TODO: Hack to remove non-UTF-8 character. Should solve this properly. #nolint
+             source = iconv(.data[["source"]], "UTF-8", "UTF-8", sub = ""),
              source = gsub("\\.", "", .data[["source"]]))
   }
   data <- data %>%

diff --git 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.7.6**
+R package **mredgebuildings**, version **0.7.7**
 
 [![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.7.6, <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.7.7, <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.7.6},
+  note = {R package version 0.7.7},
   url = {https://github.com/pik-piam/mredgebuildings},
 }
 ```