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

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

Author: jarioksa
Date: 2015-03-24 09:37:00 +0100 (Tue, 24 Mar 2015)
New Revision: 2942

Modified:
   pkg/vegan/R/ordiR2step.R
   pkg/vegan/inst/NEWS.Rd
Log:
Merge branch 'cran-2.2' into r-forge-svn-local

Modified: pkg/vegan/R/ordiR2step.R
===================================================================
--- pkg/vegan/R/ordiR2step.R	2015-03-23 07:39:19 UTC (rev 2941)
+++ pkg/vegan/R/ordiR2step.R	2015-03-24 08:37:00 UTC (rev 2942)
@@ -13,6 +13,9 @@
     ## Works only for rda(): cca() does not have (yet) R2.adjusted
     if (!inherits(object, "rda"))
         stop("can be used only with rda() or capscale()")
+    ## No R2 for capscale with negative eigenvalues
+    if (inherits(object, "capscale") && !is.null(object$CA$imaginary.chi))
+        stop("cannot be used when capscale() has negative eigenvalues")
     ## Get R2 of the original object
     if (is.null(object$CCA))
         R2.0 <- 0

Modified: pkg/vegan/inst/NEWS.Rd
===================================================================
--- pkg/vegan/inst/NEWS.Rd	2015-03-23 07:39:19 UTC (rev 2941)
+++ pkg/vegan/inst/NEWS.Rd	2015-03-24 08:37:00 UTC (rev 2942)
@@ -64,6 +64,10 @@
       graphics, and formerly they were internal functions used within
       other \pkg{vegan} functions.
 
+      \item \code{orditkplot} can export graphics in SVG format. SVG is
+      a vector graphics format which can be edited with several external
+      programs, such as Illustrator and Inkscape.
+
       \item The \code{varpart} plots of four-component models were
       redesigned following Legendre, Borcard & Roberts \emph{Ecology}
       93, 1234--1240 (2012), and they use now four ellipses instead of