Keep id args in res_cal (#9)

* Save `id` attribute while using precalc in `res_cal`function * Keep `id` args in res_cal * Fix issue while defining tests for calibration. * Cosmestic --------- Co-authored-by: Larbi Khaled <NWF93Z@ad.insee.intra>
InseeFr · Jun 1, 2023 · ad4933a · ad4933a
1 parent 4d6b13d
commit ad4933a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/R/variance_function.R b/R/variance_function.R
@@ -110,7 +110,8 @@ res_cal <- function(y = NULL, x, w = NULL, by = NULL, precalc = NULL, id = NULL)
 
   }else list2env(precalc, envir = environment())
 
-  if(is.null(y)) return(list(x = x, w = w, inv = inv)) else {
+
+  if(is.null(y)) return(list(x = x, w = w, inv = inv, id = id)) else {
     is_sparse_y <- inherits(y, c("Matrix"))
     is_matrix_y <- !is_sparse_y && inherits(y, c("matrix"))
     dimnames_y <- dimnames(y)

diff --git a/tests/testthat/test_qvar.R b/tests/testthat/test_qvar.R
@@ -20,9 +20,9 @@ technical_data_ict <- list(
                      x = as.matrix(ict_sample[
                        ict_sample$calib,
                        c(paste0("N_", 58:63), paste0("turnover_", 58:63))
-                       ]),
+                    ]),
                      w = ict_sample$w_calib[ict_sample$calib],
-                     id = ict_sample$firm_id
+                    id = ict_sample$firm_id[ict_sample$calib]
     )
   )
 )