[Vegan-commits] r2823 - in pkg/vegan: R inst

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

Author: jarioksa
Date: 2014-01-06 17:40:24 +0100 (Mon, 06 Jan 2014)
New Revision: 2823

Modified:
   pkg/vegan/R/anosim.R
   pkg/vegan/R/mantel.R
   pkg/vegan/R/mantel.partial.R
   pkg/vegan/inst/ChangeLog
Log:
... may be used in an incorrect context: revert r2765

Modified: pkg/vegan/R/anosim.R
===================================================================
--- pkg/vegan/R/anosim.R	2014-01-06 14:02:57 UTC (rev 2822)
+++ pkg/vegan/R/anosim.R	2014-01-06 16:40:24 UTC (rev 2823)
@@ -55,7 +55,7 @@
         if(.Platform$OS.type == "unix" && !hasClus) {
             perm <- unlist(mclapply(1:permutations, function(i, ...)
                                     ptest(permat[i,]),
-                                    mc.cores = parallel, ...))
+                                    mc.cores = parallel))
         } else {
             if (!hasClus) {
                 parallel <- makeCluster(parallel)

Modified: pkg/vegan/R/mantel.R
===================================================================
--- pkg/vegan/R/mantel.R	2014-01-06 14:02:57 UTC (rev 2822)
+++ pkg/vegan/R/mantel.R	2014-01-06 16:40:24 UTC (rev 2823)
@@ -49,7 +49,7 @@
                 perm <- do.call(rbind,
                                mclapply(1:permutations,
                                         function(i, ...) ptest(permat[i,],...),
-                                        mc.cores = parallel, ...))
+                                        mc.cores = parallel))
             } else {
                 if (!hasClus) {
                     parallel <- makeCluster(parallel)

Modified: pkg/vegan/R/mantel.partial.R
===================================================================
--- pkg/vegan/R/mantel.partial.R	2014-01-06 14:02:57 UTC (rev 2822)
+++ pkg/vegan/R/mantel.partial.R	2014-01-06 16:40:24 UTC (rev 2823)
@@ -57,7 +57,7 @@
                 perm <- do.call(rbind,
                                mclapply(1:permutations,
                                         function(i, ...) ptest(permat[i,],...),
-                                        mc.cores = parallel, ...))
+                                        mc.cores = parallel))
             } else {
                 if (!hasClus) {
                     parallel <- makeCluster(parallel)

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2014-01-06 14:02:57 UTC (rev 2822)
+++ pkg/vegan/inst/ChangeLog	2014-01-06 16:40:24 UTC (rev 2823)
@@ -7,6 +7,10 @@
 	* new version opened with the CRAN release of vegan_2.0-10 on
 	December 12, 2013.
 
+	* anosim, mantel, mantel.partial: R CMD check told that "... may
+	be used in an incorrect context". The dots were added in r2765,
+	and now removed.
+
 	* BCI: names checked after http://www.theplantlist.org, but kept
 	the old (alphabetic) order of species. The changes are: Abarema
 	macradenium -> A. macradenia, Apeiba aspera -> A. glabra,