[Vegan-commits] r2912 - in pkg/vegan: . R

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

Author: jarioksa
Date: 2014-11-18 08:48:41 +0100 (Tue, 18 Nov 2014)
New Revision: 2912

Modified:
   pkg/vegan/.Rbuildignore
   pkg/vegan/DESCRIPTION
   pkg/vegan/R/plot.envfit.R
Log:
Squashed commit of the following:

commit 9dfb167c47599a319b49e81056655bbb1206f825
Author: Jari Oksanen <jari.oksanen at oulu.fi>
Date:   Tue Nov 18 09:33:42 2014 +0200

    Do not put github README.md to the R package

    (cherry picked from commit 06f649426a44e065c5e435bbdfaf4d113ece9a22)

commit 546eeac33cc904b0d0e2def40a68c80fcf7f4053
Author: Jari Oksanen <jari.oksanen at oulu.fi>
Date:   Tue Nov 18 09:35:36 2014 +0200

    vegan 2.2-0 was released: everything goes to 2.2-1 from now on

commit 454a6247af58ba9f6b92a85485687681c00effbd
Author: Jari Oksanen <jari.oksanen at oulu.fi>
Date:   Mon Nov 17 11:07:46 2014 +0200

    Update DATE for the last change in the released version

commit c0b78834b076f194556401702c78a36a870d3ddb
Author: Jari Oksanen <jari.oksanen at oulu.fi>
Date:   Wed Nov 12 12:42:33 2014 +0200

    Better fix than 83d3bf1 and cca3f27 for resetting labels in envfit

    Previous fix only looked at the null of internal labels, but these
    can be null because the item (vectors or factors) was missing, or
    the item was there but names were missing. Fix cca3f27 failed
    in the first case and 83d3bf1 in latter case. Now we check for
    the existence of factors/vectors, and if only one them is present,
    we reset it labels whether they existed or were null.

commit ad5f0dac7e52c2e0c85bd863dd8a47fd88f50975
Author: Jari Oksanen <jari.oksanen at oulu.fi>
Date:   Tue Nov 11 13:46:06 2014 +0200

    Fix labelling envfit plots with a vector of labels

    Fixes bug report #74 at github.com: it was documented that you
    do not need to use a list(vectors=, factors=) to relabel plotted
    items if there is only one type of items (vectors or factors).

Modified: pkg/vegan/.Rbuildignore
===================================================================
--- pkg/vegan/.Rbuildignore	2014-11-11 14:58:23 UTC (rev 2911)
+++ pkg/vegan/.Rbuildignore	2014-11-18 07:48:41 UTC (rev 2912)
@@ -1,5 +1,5 @@
 LICENSE
+^README\.md$
 ^\.travis\.yml$
 ^travis-tool\.sh
 ^appveyor\.yml$
-

Modified: pkg/vegan/DESCRIPTION
===================================================================
--- pkg/vegan/DESCRIPTION	2014-11-11 14:58:23 UTC (rev 2911)
+++ pkg/vegan/DESCRIPTION	2014-11-18 07:48:41 UTC (rev 2912)
@@ -1,7 +1,7 @@
 Package: vegan
 Title: Community Ecology Package
-Version: 2.2-0
-Date: 2014-11-10
+Version: 2.2-1
+Date: 2014-11-18
 Author: Jari Oksanen, F. Guillaume Blanchet, Roeland Kindt, Pierre Legendre, 
    Peter R. Minchin, R. B. O'Hara, Gavin L. Simpson, Peter Solymos, 
    M. Henry H. Stevens, Helene Wagner  

Modified: pkg/vegan/R/plot.envfit.R
===================================================================
--- pkg/vegan/R/plot.envfit.R	2014-11-11 14:58:23 UTC (rev 2911)
+++ pkg/vegan/R/plot.envfit.R	2014-11-18 07:48:41 UTC (rev 2912)
@@ -17,15 +17,14 @@
         } else {
             ## input vector: either vectors or factors must be NULL,
             ## and the existing set of labels is replaced
-            if (!is.null(labs$v) && !is.null(labs$f))
+            if (!is.null(x$vectors) && !is.null(x$factors))
                 stop("needs a list with both 'vectors' and 'factors' labels")
             ## need to handle the case where both sets of labels are NULL
             ## such as when used with the default interface and single x
-            ln <- !sapply(labs, is.null)
-            if (ln["v"])
-                labs$v <- labels
-            if (ln["f"])
+            if (!is.null(x$factors))
                 labs$f <- labels
+            else
+                labs$v <- labels
         }
     }
     vect <- NULL