Changed SpATS models to use center = TRUE in PSANOVA (#85)

lleytoncave · May 18, 2021 · 30d59b6 · 30d59b6
1 parent 0821836
commit 30d59b6
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 2 deletions.
diff --git a/R/fitModels.R b/R/fitModels.R
@@ -328,12 +328,13 @@ fitModels <- function(TP,
       }
       ## number of segments for SpATS.
       nseg <- c(length(unique(modDat[["colNum"]])),
-                length(unique(modDat[["rowNum"]]))) #/ 2
+                length(unique(modDat[["rowNum"]])))
       ## Fit and return the model.
       SpATS::SpATS(response = trait, fixed = fixedForm,
                    random = randForm,
                    spatial = ~ SpATS::PSANOVA(colNum, rowNum, nseg = nseg,
-                                              nest.div = c(2, 2)),
+                                              nest.div = c(2, 2),
+                                              center = TRUE),
                    genotype = genoCol, genotype.as.random = genoRand,
                    geno.decomp = geno.decomp, data = modDat,
                    control = list(maxit = 50, tolerance = 1e-03,

diff --git a/inst/tinytest/corr1Comp b/inst/tinytest/corr1Comp
diff --git a/inst/tinytest/corr2Comp b/inst/tinytest/corr2Comp
diff --git a/inst/tinytest/corr3Comp b/inst/tinytest/corr3Comp
diff --git a/inst/tinytest/corr4Comp b/inst/tinytest/corr4Comp
diff --git a/inst/tinytest/corr5Comp b/inst/tinytest/corr5Comp
diff --git a/inst/tinytest/corr6Comp b/inst/tinytest/corr6Comp
diff --git a/inst/tinytest/gp1Comp b/inst/tinytest/gp1Comp
diff --git a/inst/tinytest/gp2Comp b/inst/tinytest/gp2Comp
diff --git a/inst/tinytest/gp3Comp b/inst/tinytest/gp3Comp
diff --git a/inst/tinytest/gp4CheckComp b/inst/tinytest/gp4CheckComp
diff --git a/inst/tinytest/gp4Comp b/inst/tinytest/gp4Comp
diff --git a/inst/tinytest/gp5Comp b/inst/tinytest/gp5Comp
diff --git a/inst/tinytest/gp6CheckComp b/inst/tinytest/gp6CheckComp
diff --git a/inst/tinytest/gp6Comp b/inst/tinytest/gp6Comp