[Vegan-commits] r2771 - pkg/permute/R

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

Author: gsimpson
Date: 2013-11-30 17:11:35 +0100 (Sat, 30 Nov 2013)
New Revision: 2771

Modified:
   pkg/permute/R/shuffleSet2.R
Log:
use 'getAllperms' extractor

Modified: pkg/permute/R/shuffleSet2.R
===================================================================
--- pkg/permute/R/shuffleSet2.R	2013-11-30 16:10:33 UTC (rev 2770)
+++ pkg/permute/R/shuffleSet2.R	2013-11-30 16:11:35 UTC (rev 2771)
@@ -32,7 +32,7 @@
         control <- pcheck$control
     }
 
-    if(is.null(control$all.perms)) {
+    if(is.null(AP <- getAllperms(control))) {
         ## get blocking, if any
         Block <- getStrata(control, which = "blocks")
         if(is.null(Block))
@@ -57,7 +57,7 @@
         ## if we have all.perms now then we must have generated it
         ## during checking or user passed it with control
         ## Use that instead of a ranodm set
-        out <- control$all.perms
+        out <- AP
     }
 
     ## Because all.perms might have been generated, we have the