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

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

Author: jarioksa
Date: 2011-10-09 19:37:16 +0200 (Sun, 09 Oct 2011)
New Revision: 1939

Modified:
   pkg/vegan/R/nesteddisc.R
   pkg/vegan/inst/ChangeLog
Log:
faster and slacker nesteddisc, but in most cases just as good

Modified: pkg/vegan/R/nesteddisc.R
===================================================================
--- pkg/vegan/R/nesteddisc.R	2011-10-06 10:38:10 UTC (rev 1938)
+++ pkg/vegan/R/nesteddisc.R	2011-10-09 17:37:16 UTC (rev 1939)
@@ -10,7 +10,7 @@
 
     ## starting values and CONSTANTS
     NALL <- 7
-    NITER <- 1000
+    NITER <- 200
     ties <- FALSE
     trace <- FALSE
     ## Code

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2011-10-06 10:38:10 UTC (rev 1938)
+++ pkg/vegan/inst/ChangeLog	2011-10-09 17:37:16 UTC (rev 1939)
@@ -4,6 +4,11 @@
 
 Version 2.1-3 (opened October 4, 2011)
 
+	* nesteddisc: use only max 200 tries to reorder columns: tracing
+	showed that in most cases an improved ordering is found rather
+	quickly, and trying up to 1000 times takes awfully long. Now
+	faster, and usually as good as earlier, but slacker.
+
 	* simulate.rda/cca: implemented 'nsim' or an option to generate an
 	array of simulated matrices inheriting from "simmat" object and
 	using print.simmat() for a compact display. If 'nsim = 1', similar