[Vegan-commits] r1909 - pkg/vegan/tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Sep 28 17:41:03 CEST 2011
Author: jarioksa
Date: 2011-09-28 17:41:03 +0200 (Wed, 28 Sep 2011)
New Revision: 1909
Modified:
pkg/vegan/tests/oecosimu-tests.Rout.save
Log:
update for vegan at 1856 with 'swsh' "fixedmar" policy ported from r1876,7
Modified: pkg/vegan/tests/oecosimu-tests.Rout.save
===================================================================
--- pkg/vegan/tests/oecosimu-tests.Rout.save 2011-09-28 15:38:06 UTC (rev 1908)
+++ pkg/vegan/tests/oecosimu-tests.Rout.save 2011-09-28 15:41:03 UTC (rev 1909)
@@ -1269,7 +1269,8 @@
+ {
+ (method == "swap" && margin != "both") ||
+ (method == "abuswap" && margin == "both") ||
-+ (method %in% c("quasiswap", "swsh") && margin != "both")
++ (method == "quasiswap" && margin != "both") ||
++ (method == "swsh" && margin == "both")
+ }
>
> for(method in methods) {
@@ -1505,7 +1506,7 @@
[44,] 14 0 19 0 0 0 3 0 3 1 5 0
*** swsh ***
---> margin both shuffle samp <--
+--> margin rows shuffle samp <--
grand sum: [1] TRUE
row sums: [1] "Mean relative difference: 0.5330571"
col sums: [1] "Mean relative difference: 0.799931"
@@ -1559,7 +1560,7 @@
[44,] 1 0 1 0 0 0 0 0 29 0 3 1
*** swsh ***
---> margin both shuffle both <--
+--> margin rows shuffle both <--
grand sum: [1] TRUE
row sums: [1] "Mean relative difference: 0.3711844"
col sums: [1] "Mean relative difference: 0.7871569"
@@ -1612,6 +1613,114 @@
[43,] 11 0 8 0 0 0 0 0 0 0 0 0
[44,] 8 0 15 0 0 0 0 0 13 0 11 7
+*** swsh ***
+--> margin columns shuffle samp <--
+grand sum: [1] TRUE
+row sums: [1] "Mean relative difference: 0.5330571"
+col sums: [1] "Mean relative difference: 0.799931"
+fill: [1] TRUE
+row freqs: [1] TRUE
+col freqs: [1] TRUE
+ [,1] [,2] [,3] [,4] [,5] [,6] [,7] [,8] [,9] [,10] [,11] [,12]
+ [1,] 1 0 1 0 0 0 5 0 23 0 0 15
+ [2,] 6 0 6 61 0 0 0 0 0 5 1 1
+ [3,] 1 7 6 3 0 0 1 0 2 14 0 1
+ [4,] 1 3 1 0 0 1 0 0 1 9 0 7
+ [5,] 2 0 2 0 0 1 0 1 0 29 0 0
+ [6,] 4 0 0 0 0 1 6 0 1 3 1 4
+ [7,] 1 0 2 0 0 4 2 0 1 0 0 5
+ [8,] 2 0 2 0 0 4 0 0 12 2 0 2
+ [9,] 14 0 2 0 0 12 1 8 0 0 0 1
+[10,] 0 2 0 7 0 0 5 0 0 2 0 3
+[11,] 1 0 17 0 0 0 4 0 1 38 5 37
+[12,] 5 1 18 0 0 0 1 0 1 0 0 4
+[13,] 9 0 8 0 0 0 3 1 0 8 0 1
+[14,] 9 1 20 0 0 0 1 0 0 0 0 4
+[15,] 3 1 3 0 0 73 13 0 0 3 0 0
+[16,] 2 0 3 0 0 0 0 0 0 0 0 0
+[17,] 4 0 3 0 3 0 1 0 0 0 0 19
+[18,] 31 0 8 0 0 0 0 0 1 0 0 2
+[19,] 9 0 0 0 0 0 0 0 15 0 0 0
+[20,] 18 0 2 0 0 0 0 0 0 20 0 0
+[21,] 6 0 1 0 0 0 0 0 0 0 0 0
+[22,] 0 0 1 0 0 0 1 0 0 2 1 1
+[23,] 4 0 17 0 0 0 0 0 0 0 1 5
+[24,] 25 0 5 0 0 0 28 0 3 4 0 10
+[25,] 1 0 4 0 0 0 0 0 0 0 0 2
+[26,] 1 0 1 0 0 0 0 0 0 0 1 0
+[27,] 1 0 1 0 0 0 0 0 0 0 0 0
+[28,] 16 0 2 0 0 0 0 18 0 0 0 0
+[29,] 3 89 6 0 21 0 5 0 0 0 0 0
+[30,] 2 0 3 110 0 0 0 0 2 3 0 20
+[31,] 3 1 6 0 0 0 0 0 0 0 0 24
+[32,] 0 0 6 0 0 0 0 0 0 4 0 0
+[33,] 0 0 6 0 0 0 0 10 4 0 0 0
+[34,] 20 0 2 0 0 0 0 0 0 0 0 0
+[35,] 0 0 16 0 0 0 0 0 0 0 0 11
+[36,] 0 0 4 0 0 0 2 0 0 0 0 0
+[37,] 10 0 0 0 0 0 36 0 2 0 1 0
+[38,] 2 0 9 0 0 0 0 0 0 4 0 5
+[39,] 0 0 14 0 0 0 0 0 0 0 0 1
+[40,] 1 0 4 2 0 0 0 0 3 4 0 0
+[41,] 1 0 5 0 1 0 0 0 0 0 1 1
+[42,] 31 0 4 0 0 0 5 0 0 0 0 6
+[43,] 1 0 2 0 0 0 0 0 0 0 0 0
+[44,] 1 0 1 0 0 0 0 0 29 0 3 1
+
+*** swsh ***
+--> margin columns shuffle both <--
+grand sum: [1] TRUE
+row sums: [1] "Mean relative difference: 0.3711844"
+col sums: [1] "Mean relative difference: 0.7871569"
+fill: [1] TRUE
+row freqs: [1] TRUE
+col freqs: [1] TRUE
+ [,1] [,2] [,3] [,4] [,5] [,6] [,7] [,8] [,9] [,10] [,11] [,12]
+ [1,] 15 0 12 0 0 0 7 0 9 0 0 9
+ [2,] 6 0 11 7 0 0 0 0 0 9 12 6
+ [3,] 12 12 7 11 0 0 8 0 6 15 0 9
+ [4,] 9 11 10 0 0 9 0 0 8 7 0 7
+ [5,] 10 0 11 0 0 6 0 9 0 9 0 0
+ [6,] 8 0 0 0 0 11 9 0 10 5 5 4
+ [7,] 6 0 9 0 0 15 7 0 10 0 0 13
+ [8,] 7 0 8 0 0 9 0 0 6 8 0 14
+ [9,] 9 0 5 0 0 8 15 12 0 0 0 9
+[10,] 0 14 0 10 0 0 6 0 0 7 0 8
+[11,] 12 0 10 0 0 0 6 0 15 6 6 8
+[12,] 13 9 6 0 0 0 11 0 14 0 0 4
+[13,] 8 0 12 0 0 0 8 9 0 7 0 13
+[14,] 14 13 5 0 0 0 10 0 0 0 0 10
+[15,] 7 8 10 0 0 9 13 0 0 12 0 0
+[16,] 10 0 10 0 0 0 0 0 0 0 0 0
+[17,] 9 0 7 0 7 0 11 0 0 0 0 6
+[18,] 12 0 9 0 0 0 0 0 18 0 0 11
+[19,] 4 0 0 0 0 0 0 0 12 0 0 0
+[20,] 13 0 8 0 0 0 0 0 0 12 0 0
+[21,] 14 0 10 0 0 0 0 0 0 0 0 0
+[22,] 0 0 10 0 0 0 6 0 0 11 7 4
+[23,] 9 0 10 0 0 0 0 0 0 0 11 12
+[24,] 8 0 7 0 0 0 14 0 9 11 0 5
+[25,] 4 0 16 0 0 0 0 0 0 0 0 11
+[26,] 13 0 6 0 0 0 0 0 0 0 16 0
+[27,] 15 0 9 0 0 0 0 0 0 0 0 0
+[28,] 12 0 9 0 0 0 0 12 0 0 0 0
+[29,] 14 10 11 0 19 0 8 0 0 0 0 0
+[30,] 12 0 9 16 0 0 0 0 12 8 0 11
+[31,] 10 7 5 0 0 0 0 0 0 0 0 12
+[32,] 0 0 8 0 0 0 0 0 0 10 0 0
+[33,] 0 0 17 0 0 0 0 9 10 0 0 0
+[34,] 12 0 7 0 0 0 0 0 0 0 0 0
+[35,] 0 0 15 0 0 0 0 0 0 0 0 10
+[36,] 0 0 10 0 0 0 8 0 0 0 0 0
+[37,] 16 0 0 0 0 0 4 0 9 0 11 0
+[38,] 10 0 8 0 0 0 0 0 0 9 0 11
+[39,] 0 0 4 0 0 0 0 0 0 0 0 13
+[40,] 7 0 3 12 0 0 0 0 5 10 0 0
+[41,] 16 0 8 0 10 0 0 0 0 0 11 8
+[42,] 14 0 8 0 0 0 8 0 0 0 0 6
+[43,] 11 0 8 0 0 0 0 0 0 0 0 0
+[44,] 8 0 15 0 0 0 0 0 13 0 11 7
+
*** abuswap ***
--> margin rows shuffle samp <--
grand sum: [1] TRUE
More information about the Vegan-commits
mailing list