Fix assignment rules not being expanded for typo corrections.

pkg/R/typocorr.R

@@ -53,13 +53,15 @@ setGeneric("correct_typos", function(dat, x,...) standardGeneric("correct_typos"
 setMethod("correct_typos", c("data.frame","validator")
   , function(dat,x,fixate=NULL, eps=1e-8,maxdist=1, ...){
 
-  lc <- x$linear_coefficients()
-  a <- lc$b
+  # expand group and assignment rules
+  exprs <- x$exprs(lin_ineq_eps=0, lin_eq_eps=0, expand_groups=TRUE, expand_assignments=TRUE)
+  x <- do.call("validator", exprs)
+
   # separate equalities and inequalities
+  lc <- x$linear_coefficients()
   eq <- lc$operators == "=="
   F <- x[!eq,]  # inequalities
   E <- x[eq,]   # equalities
-  a <- a[eq]
   vars <- validate::variables(E)
 
   fixate <- if( is.null(fixate) ) {

pkg/inst/tinytest/test_correct_typos.R

@@ -128,4 +128,10 @@ dat2 <- read.csv(textConnection(
   expect_equivalent(dat, correct_typos(dat,v))
 
 
-
+## works with var_group ----
+d <- data.frame(a=NA, b=0, c=4, d=5)
+expected_result <- data.frame(a=1, b=0, c=4, d=5)
+v <- validator(var_group(a,b,c,d) >= 0, a+b+c == d)
+expect_equal(impute_lr(d, v), expected_result)
+v <- validator(g := var_group(a,b,c,d), g >= 0, a+b+c == d)
+expect_equal(impute_lr(d, v), expected_result)

pkg/inst/tinytest/test_linimpute.R

@@ -176,9 +176,12 @@ expect_equal(impute_lr(df_in,v, methods="fm"),df_out)
 
 
 ## works with var_group ----
+d <- data.frame(a=NA, b=NA, c=5, d=5)
+expected_result <- data.frame(a=0, b=0, c=5, d=5)
 rules <- validator(var_group(a,b,c,d) >= 0, a+b+c == d)
-d <- data.frame(a=NA, b=NA, c=5,d=5)
-expect_equal(impute_lr(d,rules, method="fm"), data.frame(a=0,b=0,c=5,d=5))
+expect_equal(impute_lr(d,rules, method="fm"), expected_result)
+rules <- validator(g := var_group(a,b,c,d), g >= 0, a+b+c == d)
+expect_equal(impute_lr(d,rules, method="fm"), expected_result)
 
 ## works with ill-defined problem ----
 rules <- validator(var_group(a,b,c,d)>=0, a+b+c==d)