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

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

Author: jarioksa
Date: 2011-02-15 08:49:05 +0100 (Tue, 15 Feb 2011)
New Revision: 1489

Modified:
   pkg/vegan/R/nestednodf.R
   pkg/vegan/inst/ChangeLog
Log:
nestednodf did not do weighted = FALSE if order = FALSE (reported by Daniel Spitale)

Modified: pkg/vegan/R/nestednodf.R
===================================================================
--- pkg/vegan/R/nestednodf.R	2011-02-14 17:09:42 UTC (rev 1488)
+++ pkg/vegan/R/nestednodf.R	2011-02-15 07:49:05 UTC (rev 1489)
@@ -4,6 +4,8 @@
     bin.comm <- ifelse(comm > 0, 1, 0)
     rfill <- rowSums(bin.comm)
     cfill <- colSums(bin.comm)
+    if (!weighted)
+        comm <- bin.comm
     if (order) {
         if (weighted) {
             rgrad <- rowSums(comm)
@@ -13,7 +15,6 @@
         } else {
             rorder <- order(rfill, decreasing = TRUE)
             corder <- order(cfill, decreasing = TRUE)
-            comm <- bin.comm
         }
         comm <- comm[rorder, corder]
         rfill <- rfill[rorder]

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2011-02-14 17:09:42 UTC (rev 1488)
+++ pkg/vegan/inst/ChangeLog	2011-02-15 07:49:05 UTC (rev 1489)
@@ -4,6 +4,9 @@
 
 Version 1.18-22 (opened January 19, 2011)
 
+	* nestednodf: did not go to 'weighted = FALSE' with quantitative
+	data if 'order = FALSE'. Reported by Daniel Spitale.  
+
 	* eigenvals: learnt to know 'dudi' objects of the ade4 package,
 	and 'pco' an 'pca' obejct of the labdsv package.