tidy

Author: rsbivand

R/SLX_WX.R

@@ -272,7 +272,8 @@ impacts.SlX <- function(obj, ...) {
     stopifnot(!is.null(attr(obj, "mixedImps")))
     n <- nrow(obj$model)
     k <- obj$qr$rank
-    impactsWX(attr(obj, "mixedImps"), n, k, type="SlX", method="glht")
+    impactsWX(attr(obj, "mixedImps"), n, k, type="SlX", method="glht",
+        have_factor_preds=attr(obj, "have_factor_preds"))
 }
 
 impactsWX <- function(obj, n, k, type="SlX", method="glht", have_factor_preds=FALSE) {
@@ -302,6 +303,30 @@ update_bnames <- function(bnames, have_factor_preds=FALSE) {
         for (pred in seq(along=factnames)) {
             npred <- grep(paste0("^", factnames[pred], ".*"), bnames)
             b_suffix[npred] <- "(F)"
+#=======
+#        xlevels <- attr(have_factor_preds, "xlevels")
+#        contrasts <- attr(have_factor_preds, "pred_contrasts")
+#        for (pred in seq(along=factnames)) {
+#            npred <- grep(factnames[pred], bnames)
+#            xlpred <- xlevels[[pred]]
+#            cpred <- contrasts[[pred]]
+#            if (length(npred) >= length(xlpred)) {
+#                b_suffix[npred] <- ""
+#            } else {
+#                if (cpred == "contr.treatment") {
+#                    b_suffix[npred] <- xlpred[-1]
+#                } else if (cpred == "code_control") {
+#                    b_suffix[npred] <- paste(xlpred[-1], "vs.", xlpred[1])
+#                } else if (cpred == "code_diff") {
+#                    b_suffix[npred] <- paste(xlpred[-1], "vs.",
+#                        xlpred[-length(xlpred)])
+#                } else if (cpred == "contr.poly") {
+#                    b_suffix[npred] <- "poly"
+#                } else {
+#                    b_suffix[npred] <- ""
+#                }
+#            }
+#>>>>>>> ddd1e233b0387bd18bd409837b00671295e6001d
         }
     }
     bnames <- paste(bnames, b_suffix)

inst/tinytest/test_Durbin_factor.R

@@ -3,33 +3,33 @@ data(oldcol, package="spdep")
 lw <- spdep::nb2listw(COL.nb)
 COL.OLD$fEW <- factor(COL.OLD$EW)
 COL.OLD$fDISCBD <- ordered(cut(COL.OLD$DISCBD, c(0, 1.5, 3, 4.5, 6)))
-f <- formula(CRIME ~ INC + HOVAL + fDISCBD*fEW)
+f <- formula(CRIME ~ INC + HOVAL + fDISCBD + fEW)
 expect_warning(COL.SLX0 <- lmSLX(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.SLX1 <- lmSLX(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.SLX1 <- lmSLX(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.SLX2 <- lmSLX(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fEW))
 expect_silent(COL.SLX3 <- lmSLX(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
 expect_warning(COL.err0 <- errorsarlm(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.err1 <- errorsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.err1 <- errorsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.err2 <- errorsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
 expect_silent(COL.err3 <- errorsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
 expect_warning(COL.lag0 <- lagsarlm(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.lag1 <- lagsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.lag1 <- lagsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.lag2 <- lagsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
 expect_silent(COL.lag3 <- lagsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
 expect_warning(COL.sac0 <- sacsarlm(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.sac1 <- sacsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.sac1 <- sacsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.sac2 <- sacsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
 expect_silent(COL.sac3 <- sacsarlm(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
 expect_warning(COL.lag0 <- spBreg_lag(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.lag1 <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.lag1 <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.lag2 <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
 expect_silent(COL.lag3 <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
 expect_warning(COL.err0 <- spBreg_err(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.err1 <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.err1 <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.err2 <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
 expect_silent(COL.err3 <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
 expect_warning(COL.sac0 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=TRUE))
-expect_warning(COL.sac1 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
+expect_warning(COL.sac1 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD + fEW))
 expect_warning(COL.sac2 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
 expect_silent(COL.sac3 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))