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

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

Author: psolymos
Date: 2014-02-20 18:04:40 +0100 (Thu, 20 Feb 2014)
New Revision: 2857

Modified:
   pkg/vegan/R/adipart.default.R
   pkg/vegan/R/hiersimu.default.R
   pkg/vegan/R/multipart.default.R
   pkg/vegan/inst/ChangeLog
Log:
non-nested hierarchy leads to non-sensible results

Modified: pkg/vegan/R/adipart.default.R
===================================================================
--- pkg/vegan/R/adipart.default.R	2014-02-11 15:13:12 UTC (rev 2856)
+++ pkg/vegan/R/adipart.default.R	2014-02-20 17:04:40 UTC (rev 2857)
@@ -35,7 +35,7 @@
     rval <- as.data.frame(rval[rev(1:length(rval))])
     l2 <- sapply(rval, function(z) length(unique(z)))
     if (any(l1 != l2))
-        warning("levels are not perfectly nested")
+        stop("levels are not perfectly nested")
 
     ## aggregate response matrix
     fullgamma <-if (nlevels(rhs[,nlevs]) == 1)

Modified: pkg/vegan/R/hiersimu.default.R
===================================================================
--- pkg/vegan/R/hiersimu.default.R	2014-02-11 15:13:12 UTC (rev 2856)
+++ pkg/vegan/R/hiersimu.default.R	2014-02-20 17:04:40 UTC (rev 2857)
@@ -32,7 +32,7 @@
     rval <- as.data.frame(rval[rev(1:length(rval))])
     l2 <- sapply(rval, function(z) length(unique(z)))
     if (any(l1 != l2))
-        warning("levels are not perfectly nested")
+        stop("levels are not perfectly nested")
 
     ## aggregate response matrix
     fullgamma <-if (nlevels(rhs[,nlevs]) == 1)

Modified: pkg/vegan/R/multipart.default.R
===================================================================
--- pkg/vegan/R/multipart.default.R	2014-02-11 15:13:12 UTC (rev 2856)
+++ pkg/vegan/R/multipart.default.R	2014-02-20 17:04:40 UTC (rev 2857)
@@ -37,7 +37,7 @@
     rval <- as.data.frame(rval[rev(1:length(rval))])
     l2 <- sapply(rval, function(z) length(unique(z)))
     if (any(l1 != l2))
-        warning("levels are not perfectly nested")
+        stop("levels are not perfectly nested")
 
     ## aggregate response matrix
     fullgamma <-if (nlevels(rhs[,nlevs]) == 1)

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2014-02-11 15:13:12 UTC (rev 2856)
+++ pkg/vegan/inst/ChangeLog	2014-02-20 17:04:40 UTC (rev 2857)
@@ -4,6 +4,9 @@
 
 Version 2.1-41 (opened December 12, 2013)
 
+	* adipart, multipart, hiersimu: it is now an error to provide 
+	non-nested sampling hierarchy (used to be a warning).
+
 	* new version opened with the CRAN release of vegan_2.0-10 on
 	December 12, 2013.