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

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

Author: gsimpson
Date: 2013-06-12 21:22:08 +0200 (Wed, 12 Jun 2013)
New Revision: 2519

Modified:
   pkg/permute/R/allPerms.R
   pkg/permute/R/numPerms.R
   pkg/permute/man/check.Rd
Log:
final example not working in check.Rd now works after some bug fixes and tweaks

Modified: pkg/permute/R/allPerms.R
===================================================================
--- pkg/permute/R/allPerms.R	2013-06-12 19:21:12 UTC (rev 2518)
+++ pkg/permute/R/allPerms.R	2013-06-12 19:22:08 UTC (rev 2519)
@@ -8,7 +8,7 @@
     ## number of observations in data
     n <- nobs(v)
     ## check permutation scheme and update control
-    ## pcheck <- check(v, control = control, make.all = FALSE)
+    pcheck <- check(v, control = control, make.all = FALSE)
     ## ctrl <- pcheck$control
 
     ## get max number of permutations

Modified: pkg/permute/R/numPerms.R
===================================================================
--- pkg/permute/R/numPerms.R	2013-06-12 19:21:12 UTC (rev 2518)
+++ pkg/permute/R/numPerms.R	2013-06-12 19:22:08 UTC (rev 2519)
@@ -160,4 +160,7 @@
                 n
         }
     }
+
+    ## return
+    num.p * num.wi
 }

Modified: pkg/permute/man/check.Rd
===================================================================
--- pkg/permute/man/check.Rd	2013-06-12 19:21:12 UTC (rev 2518)
+++ pkg/permute/man/check.Rd	2013-06-12 19:22:08 UTC (rev 2519)
@@ -141,12 +141,9 @@
       control = how(plots = Plots(strata = ditch),
                     within = Within(type = "series", mirror = TRUE,
                                     constant = TRUE)))
-
-\dontrun{ % FIXME these fail in allStrata needing 235.5 Gb RAM!!
 ## permute strata
 check(pyrifos, how(plots = Plots(strata = ditch, type = "free"),
                    within = Within(type = "none")))
-}
 
 ## this should also also for arbitrary vectors
 vec1 <- check(1:100)