simpler join syntax

mnwright · mnwright · commit 0d30c110dd6a · 2026-01-12T10:29:14.000+01:00
diff --git a/R/expct.R b/R/expct.R
@@ -233,7 +233,7 @@ expct <- function(
                           sort = FALSE, allow.cartesian = TRUE)
         psi_uncond <- merge(omega, params$cat[variable %in% query, ], by.x = 'f_idx_uncond', by.y = 'f_idx',
                             sort = FALSE, allow.cartesian = TRUE)
-        psi_uncond_relevant <- psi_uncond[!psi_cond[,.(idx, variable)], on = .(idx, variable), all = FALSE]
+        psi_uncond_relevant <- psi_uncond[!psi_cond, on = .(idx, variable)]
         psi <- rbind(psi_cond, psi_uncond_relevant)
       }
       psi[NA_share == 1, wt := 0]
diff --git a/R/forge.R b/R/forge.R
@@ -251,7 +251,7 @@ forge <- function(
                           sort = FALSE, allow.cartesian = TRUE)
         psi_uncond <- merge(omega, params$cat, by.x = 'f_idx_uncond', by.y = 'f_idx',
                             sort = FALSE, allow.cartesian = TRUE)
-        psi_uncond_relevant <- psi_uncond[!psi_cond[,.(idx, variable)], on = .(idx, variable), all = FALSE]
+        psi_uncond_relevant <- psi_uncond[!psi_cond, on = .(idx, variable)]
         psi <- rbind(psi_cond, psi_uncond_relevant)
       }
       psi[prob < 1, val := sample(val, 1, prob = prob), by = .(variable, idx)]

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ expct <- function(`
`233`	`233`	`sort = FALSE, allow.cartesian = TRUE)`
`234`	`234`	`psi_uncond <- merge(omega, params$cat[variable %in% query, ], by.x = 'f_idx_uncond', by.y = 'f_idx',`
`235`	`235`	`sort = FALSE, allow.cartesian = TRUE)`
`236`		`- psi_uncond_relevant <- psi_uncond[!psi_cond[,.(idx, variable)], on = .(idx, variable), all = FALSE]`
	`236`	`+ psi_uncond_relevant <- psi_uncond[!psi_cond, on = .(idx, variable)]`
`237`	`237`	`psi <- rbind(psi_cond, psi_uncond_relevant)`
`238`	`238`	`}`
`239`	`239`	`psi[NA_share == 1, wt := 0]`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ forge <- function(`
`251`	`251`	`sort = FALSE, allow.cartesian = TRUE)`
`252`	`252`	`psi_uncond <- merge(omega, params$cat, by.x = 'f_idx_uncond', by.y = 'f_idx',`
`253`	`253`	`sort = FALSE, allow.cartesian = TRUE)`
`254`		`- psi_uncond_relevant <- psi_uncond[!psi_cond[,.(idx, variable)], on = .(idx, variable), all = FALSE]`
	`254`	`+ psi_uncond_relevant <- psi_uncond[!psi_cond, on = .(idx, variable)]`
`255`	`255`	`psi <- rbind(psi_cond, psi_uncond_relevant)`
`256`	`256`	`}`
`257`	`257`	`psi[prob < 1, val := sample(val, 1, prob = prob), by = .(variable, idx)]`