[Vegan-commits] r2974 - pkg/vegan/R

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

Author: jarioksa
Date: 2015-11-13 08:21:48 +0100 (Fri, 13 Nov 2015)
New Revision: 2974

Modified:
   pkg/vegan/R/howHead.R
Log:
Squashed commit of the following:

commit 8587c83f846a91221a6cc9d24a533029e18425a0
Author: Gavin L. Simpson <ucfagls at gmail.com>
Date:   Thu Nov 12 16:09:43 2015 -0600

    fix a bug in determining the numbers of rows and columns in a within-plot grid design

    (cherry picked from commit 2fa990a8e23cfb0c56800155dac9c99127745218)

Modified: pkg/vegan/R/howHead.R
===================================================================
--- pkg/vegan/R/howHead.R	2015-11-05 14:02:11 UTC (rev 2973)
+++ pkg/vegan/R/howHead.R	2015-11-13 07:21:48 UTC (rev 2974)
@@ -39,8 +39,8 @@
             head <- paste0(head, " constant permutation within each Plot")
     }
     if (isTRUE(all.equal(type, "grid"))) {
-        nr <- getRow(x, which = "plots")
-        nc <- getCol(x, which = "plots")
+        nr <- getRow(x, which = "within")
+        nc <- getCol(x, which = "within")
         head <- paste0(head, sprintf(ngettext(nr, " %d row", " %d rows"),
                                     nr))
         head <- paste0(head, sprintf(ngettext(nc, " %d column",