diff --git a/R/fitModels.R b/R/fitModels.R index c34843a..7f5a43b 100644 --- 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 index 39a6a41..47f49e8 100644 Binary files a/inst/tinytest/corr1Comp and b/inst/tinytest/corr1Comp differ diff --git a/inst/tinytest/corr2Comp b/inst/tinytest/corr2Comp index 7f3639c..070688a 100644 Binary files a/inst/tinytest/corr2Comp and b/inst/tinytest/corr2Comp differ diff --git a/inst/tinytest/corr3Comp b/inst/tinytest/corr3Comp index f503f14..b3b957e 100644 Binary files a/inst/tinytest/corr3Comp and b/inst/tinytest/corr3Comp differ diff --git a/inst/tinytest/corr4Comp b/inst/tinytest/corr4Comp index 9bc29b8..109fc22 100644 Binary files a/inst/tinytest/corr4Comp and b/inst/tinytest/corr4Comp differ diff --git a/inst/tinytest/corr5Comp b/inst/tinytest/corr5Comp index c59268d..d4cdcee 100644 Binary files a/inst/tinytest/corr5Comp and b/inst/tinytest/corr5Comp differ diff --git a/inst/tinytest/corr6Comp b/inst/tinytest/corr6Comp index 845f0ce..2b95e64 100644 Binary files a/inst/tinytest/corr6Comp and b/inst/tinytest/corr6Comp differ diff --git a/inst/tinytest/gp1Comp b/inst/tinytest/gp1Comp index 8dce159..3c2a8de 100644 Binary files a/inst/tinytest/gp1Comp and b/inst/tinytest/gp1Comp differ diff --git a/inst/tinytest/gp2Comp b/inst/tinytest/gp2Comp index ef9b83a..a5cc5ea 100644 Binary files a/inst/tinytest/gp2Comp and b/inst/tinytest/gp2Comp differ diff --git a/inst/tinytest/gp3Comp b/inst/tinytest/gp3Comp index 99e6811..7f56e35 100644 Binary files a/inst/tinytest/gp3Comp and b/inst/tinytest/gp3Comp differ diff --git a/inst/tinytest/gp4CheckComp b/inst/tinytest/gp4CheckComp index e32aafa..e92c8f4 100644 Binary files a/inst/tinytest/gp4CheckComp and b/inst/tinytest/gp4CheckComp differ diff --git a/inst/tinytest/gp4Comp b/inst/tinytest/gp4Comp index 735478a..d91f4b9 100644 Binary files a/inst/tinytest/gp4Comp and b/inst/tinytest/gp4Comp differ diff --git a/inst/tinytest/gp5Comp b/inst/tinytest/gp5Comp index 0ecb0ff..af31d7d 100644 Binary files a/inst/tinytest/gp5Comp and b/inst/tinytest/gp5Comp differ diff --git a/inst/tinytest/gp6CheckComp b/inst/tinytest/gp6CheckComp index dd3a4b7..9cef48b 100644 Binary files a/inst/tinytest/gp6CheckComp and b/inst/tinytest/gp6CheckComp differ diff --git a/inst/tinytest/gp6Comp b/inst/tinytest/gp6Comp index 7df4485..5294e10 100644 Binary files a/inst/tinytest/gp6Comp and b/inst/tinytest/gp6Comp differ