[Vegan-commits] r1802 - in pkg/permute: inst man

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

Author: gsimpson
Date: 2011-09-07 22:58:29 +0200 (Wed, 07 Sep 2011)
New Revision: 1802

Modified:
   pkg/permute/inst/ChangeLog
   pkg/permute/man/permCheck.Rd
Log:
fixes to make pass check with vegan 1.17-12 on CRAN

Modified: pkg/permute/inst/ChangeLog
===================================================================
--- pkg/permute/inst/ChangeLog	2011-09-07 16:04:10 UTC (rev 1801)
+++ pkg/permute/inst/ChangeLog	2011-09-07 20:58:29 UTC (rev 1802)
@@ -2,12 +2,16 @@
 
 permute ChangeLog
 
-Version 0.6-1 (opened September 7, 2011)
+Version 0.6-1 (released to CRAN on September 7, 2011)
 
 	* NAMESPACE: export(permuplot)
 
-Version 0.6-0 (released to CRAN on September 7, 2011)
+	* check.Rd: temporarily supress some of the examples to run
+	only on vegan >= 2.0-0. Needed during transition to pass
+	checks on CRAN until version 2.0-0 is released.
 
+Version 0.6-0 (closed September 7, 2011)
+
 	* allPerms: added warning regarding current need for samples
 	to be arranged in order of any strata.
 

Modified: pkg/permute/man/permCheck.Rd
===================================================================
--- pkg/permute/man/permCheck.Rd	2011-09-07 16:04:10 UTC (rev 1801)
+++ pkg/permute/man/permCheck.Rd	2011-09-07 20:58:29 UTC (rev 1802)
@@ -110,6 +110,11 @@
 
 \examples{
 %\dontrun{
+
+## Only for vegan >= 2.0-0
+vers <- packageDescription("vegan")$Version
+
+if(vers >= "2.0-0") {
 ## use example data from ?pyrifos in package vegan
 require(vegan)
 example(pyrifos)
@@ -120,7 +125,7 @@
 ## no restrictions - lots of perms
 CONTROL <- permControl(within = Within(type = "free"))
 (check1 <- check(pyrifos, CONTROL))
-summary(check1)
+##summary(check1)
 
 ## no strata but data are series with no mirroring, so 132 permutations
 CONTROL <- permControl(within = Within(type = "series",
@@ -195,8 +200,9 @@
 (tmp4 <- allPerms(12, control = ctrl))
 ## prints out details of the permutation scheme as
 ## well as the matrix of permutations
-summary(tmp) %% FIXME these don't print the scheme
-summary(tmp2)
+##summary(tmp) %% FIXME these don't print the scheme
+##summary(tmp2)
+}
 
 %% FIXME - need all these updating to new API in permControl...
 %% Fixed one, above, but there may still be problems with some of