[Picante-commits] r31 - in pkg: . R

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

Author: pdc
Date: 2008-02-26 21:00:56 +0100 (Tue, 26 Feb 2008)
New Revision: 31

Modified:
   pkg/DESCRIPTION
   pkg/R/phylo2phylog.R
Log:
add the requirement for ade4 and suggest the package.  Also removed the multi.line = FALSE argument to write.tree() this appears note to be a valid argument

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2008-02-26 19:47:23 UTC (rev 30)
+++ pkg/DESCRIPTION	2008-02-26 20:00:56 UTC (rev 31)
@@ -6,6 +6,6 @@
 Author: Steve Kembel <skembel at berkeley.edu>, David Ackerly <dackerly at berkeley.edu>, Simon Blomberg <s.blomberg1 at uq.edu.au>, Peter Cowan <pdc at berkeley.edu>, Cam Webb <cwebb at oeb.harvard.edu>
 Maintainer: Steve Kembel <skembel at berkeley.edu>
 Depends: ape, geiger, vegan
-Suggests: circular
+Suggests: circular, ade4
 Description: Phylocom integration, community analyses, null-models, traits and evolution in R
 License: GPL v2

Modified: pkg/R/phylo2phylog.R
===================================================================
--- pkg/R/phylo2phylog.R	2008-02-26 19:47:23 UTC (rev 30)
+++ pkg/R/phylo2phylog.R	2008-02-26 20:00:56 UTC (rev 31)
@@ -1,5 +1,6 @@
 `phylo2phylog` <-
 function(phy, ...) {
-    newick2phylog(write.tree(phy, multi.line = FALSE),...)
+    if(!require(ade4)) {stop("This function requires the ade4 package")}
+    newick2phylog(write.tree(phy),...)
 }