[Vegan-commits] r2733 - in pkg/permute: R man

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2013-11-21 17:52:27 +0100 (Thu, 21 Nov 2013)
New Revision: 2733

Modified:
   pkg/permute/R/shuffleSet2.R
   pkg/permute/man/shuffleSet.Rd
Log:
use 'set-methods' instead of 'update()'; minor documentation tweak

Modified: pkg/permute/R/shuffleSet2.R
===================================================================
--- pkg/permute/R/shuffleSet2.R	2013-11-21 16:50:28 UTC (rev 2732)
+++ pkg/permute/R/shuffleSet2.R	2013-11-21 16:52:27 UTC (rev 2733)
@@ -15,7 +15,7 @@
         else
             nset <- np
     } else {
-        control <- update(control, nperm = nset)
+        setNperm(control) <- nset ## this fixes the control$call too!
     }
 
     sn <- seq_len(n) ## sequence of samples in order of input

Modified: pkg/permute/man/shuffleSet.Rd
===================================================================
--- pkg/permute/man/shuffleSet.Rd	2013-11-21 16:50:28 UTC (rev 2732)
+++ pkg/permute/man/shuffleSet.Rd	2013-11-21 16:52:27 UTC (rev 2733)
@@ -95,8 +95,7 @@
 shuffleSet(n = 10, nset = 5)
 
 ## series random permutations, 5 permutations in set
-shuffleSet(10, 5, how(within = Within(type = "series")),
-           check = FALSE)
+shuffleSet(10, 5, how(within = Within(type = "series")))
 
 ## series random permutations, 10 permutations in set,
 ## with possible mirroring
@@ -117,7 +116,7 @@
 ## as above but same random permutation within Plot-level strata
 CTRL <- how(plots = plotStrata,
             within = Within(type = "free", constant = TRUE))
-shuffleSet(20, 10, CTRL)
+shuffleSet(20, 10, CTRL) ## check this.
 
 ## time series within each level of Plot strata
 CTRL <- how(plots = plotStrata,