Fixing up wholeplot column in split plot designs

R/des_info.R

@@ -439,17 +439,23 @@ des_info <- function(design.obj,
 
     if(design == "split") {
         des <- design.obj$book
+
+        numsp <- max(as.numeric(des$splots))
+        lenblk <- as.vector(table(des$block)[1])
+        numwp <- lenblk/numsp
+        des$wplots <- rep(rep(1:numwp, each = numsp), max(as.numeric(des$block)))
+        des <- des[, c(1, 3, 6, 2, 4, 5)]
+
         spfacs <- c("plots", "block", "wplots", "splots")
 
         trtNams <- names(des[!is.element(names(des), spfacs)])
-
+        design.obj$book <- des
 
         des$treatments <- factor(paste(des[, trtNams[1]], des[, trtNams[2]], sep = "_"))
 
         # Number of treatments
         ntrt <- nlevels(des$treatments)
 
-
         # Calculate direction of blocking
         xx <- c()
         rr <- nrows / brows

R/design.R

@@ -156,11 +156,6 @@ design <- function(type,
                                              trt2 = sub_treatments,
                                              r = reps,
                                              seed = ifelse(is.numeric(seed), seed, 0))
-       numsp <- max(as.numeric(outdesign$book$splots))
-       lenblk <- as.vector(table(outdesign$book$block)[1])
-       numwp <- lenblk/numsp
-       outdesign$book$wplots <- rep(rep(1:numwp, each = numsp), reps)
-       outdesign$book <- outdesign$book[, c(1, 3, 6, 2, 4, 5)]
     }
 
     else if(substr(tolower(type), 1, 7) == "crossed") {

R/satab.R

@@ -1,6 +1,6 @@
 #' Produces a skeletal ANOVA table
 #'
-#' @param design.obj An `agricolae` design object.
+#' @param design.obj A modified `agricolae` design object as output from des_info.
 #'
 #' @return Prints skeletal ANOVA table to console output.
 #'
@@ -112,12 +112,12 @@ satab <- function(design.obj) {
     blkdf <- length(unique(design.obj$block)) - 1
     totdf <- nrow(design.obj) - 1
     numwplots <- nrow(design.obj) / length(unique(design.obj$splots))
-    sp.facWdf <- length(unique(design.obj[, 5])) - 1
-    wpresdf <- (numwplots - 1) - blkdf - sp.facWdf
 
     trtAdf <- length(unique(design.obj[, 5])) - 1
     trtBdf <- length(unique(design.obj[, 6])) - 1
     trtABdf <- trtAdf * trtBdf
+
+    wpresdf <- (numwplots - 1) - blkdf - trtAdf
     errdf <- totdf - trtAdf - trtBdf - trtABdf - blkdf - wpresdf
 
     output <- paste0(format("Source of Variation", width = 45), "df", "\n")