unknown update :/

Author: gaelso

R/fct_combine_mcs_cstock.R

@@ -123,6 +123,10 @@ fct_combine_sims_C_allstock <- function(.ad, .cs, .usr){
 
     c_check <- fct_check_pool(.c_sub = c_sub, .c_unit = .usr$c_unit, .c_fraction = .usr$c_fraction)
     c_form  <- fct_make_formula(.c_check = c_check, .c_unit = .usr$c_unit)
+    c_pools <- stringr::str_remove_all(c_form, pattern = "\\+|\\*|\\(|\\)") |>
+      stringr::str_split(pattern = "  ") |>
+      unlist() |>
+      unique()
 
     tibble(
       period = period,
@@ -159,24 +163,30 @@ fct_combine_sims_C_allstock <- function(.ad, .cs, .usr){
 
   if ("DG_ratio" %in% unique(sims_C_all$c_form)) {
 
-    ## + Get pools used for DG
+    ## + Get elements used for DG
     if (.usr$dg_pool == "ALL") {
       dg_pool <- "C_all"
     } else {
       dg_pool <- stringr::str_split(.usr$dg_pool, pattern = ",") |> purrr::map(stringr::str_trim) |> unlist()
     }
-    dg_pool_intact <- paste0(dg_pool, "_intact")
+    #dg_pool_intact <- paste0(dg_pool, "_intact")
 
-    ## + Filter DG to modify formula and recalculate
+    ## + Filter DG_ratio elements
     sims_DG <- sims_C_all |>
       dplyr::filter(.data$c_form == "DG_ratio") |>
       dplyr::mutate(
         lu_intact = stringr::str_remove(.data$lu_id, pattern = .usr$dg_ext)
       )
 
+    ## + Filter intact elements associated with DG land uses
     sims_C_intact <- sims_C_all |>
-      dplyr::filter(.data$lu_id %in% unique(sims_DG$lu_intact)) |>
-      dplyr::select("sim_no", lu_intact = "lu_id", !!!rlang::syms(dg_pool))
+      dplyr::filter(.data$lu_id %in% unique(sims_DG$lu_intact))
+
+    intact_pools <- stringr::str_subset(  |>
+      dplyr::select("c_form") |>
+      purrr::discard(~all(is.na(.)))
+      #dplyr::select("sim_no", lu_intact = "lu_id", !!!rlang::syms(dg_pool))
+
 
     names(sims_C_intact)[!(names(sims_C_intact) %in% c("sim_no", "lu_intact"))] <- dg_pool_intact
 

R/fct_make_formula.R

@@ -56,7 +56,7 @@ fct_make_formula <- function(.c_check, .c_unit){
   c_eq_out <- c_eq1
 
   if (.c_check$has_RS) {
-    c_eq_out["BGB"] <- "AGB*RS"
+    c_eq_out["BGB"] <- "AGB * RS"
   } else if (!.c_check$has_BG){
     c_eq_out <- c_eq_out[!(names(c_eq_out) %in% c("plus_bgb", "BGB"))]
   }

inst/extdata/example2-with-sims.xlsx

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 59e49fa2-c663-4d17-89e0-9f1f39ed9ade
 
 RestoreWorkspace: No
 SaveWorkspace: No

mocaredd.Rproj

@@ -0,0 +1,2 @@
+library(Microsoft365R)
+odb <- get_business_onedrive()