[Phylobase-commits] r259 - in branches/pdcgsoc: . R

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

Author: pdc
Date: 2008-08-06 21:53:37 +0200 (Wed, 06 Aug 2008)
New Revision: 259

Modified:
   branches/pdcgsoc/DESCRIPTION
   branches/pdcgsoc/R/treePlot.R
Log:
fix infinite install loop and add treePlot.R to collate
apparently you can't require phylobase at the top of a file which is loaded with phylobase

Modified: branches/pdcgsoc/DESCRIPTION
===================================================================
--- branches/pdcgsoc/DESCRIPTION	2008-08-06 19:33:06 UTC (rev 258)
+++ branches/pdcgsoc/DESCRIPTION	2008-08-06 19:53:37 UTC (rev 259)
@@ -9,5 +9,5 @@
 Maintainer:  Ben Bolker <bolker at ufl.edu>
 Description: Provides a base S4 class for comparative methods, incorporating one or more trees and trait data
 License: GPL
-Collate: phylo4.R checkdata.R class-multiphylo4.R class-oldclasses.R class-phylo4.R class-phylo4d.R  methods-multiphylo4.R methods-oldclasses.R methods-phylo4.R methods-phylo4d.R setAs-Methods.R pdata.R subset.R prune.R plot.R identify.R treestruc.R treewalk.R ReadWithNCL.R tbind.R zzz.R 
+Collate: phylo4.R checkdata.R class-multiphylo4.R class-oldclasses.R class-phylo4.R class-phylo4d.R  methods-multiphylo4.R methods-oldclasses.R methods-phylo4.R methods-phylo4d.R setAs-Methods.R pdata.R subset.R prune.R plot.R treePlot.R identify.R treestruc.R treewalk.R ReadWithNCL.R tbind.R zzz.R 
 URL: http://phylobase.R-forge.R-project.org

Modified: branches/pdcgsoc/R/treePlot.R
===================================================================
--- branches/pdcgsoc/R/treePlot.R	2008-08-06 19:33:06 UTC (rev 258)
+++ branches/pdcgsoc/R/treePlot.R	2008-08-06 19:53:37 UTC (rev 259)
@@ -1,6 +1,3 @@
-require(phylobase)
-require(grid)
-require(lattice)
 treePlot <- function(phy, 
                      type = c('phylogram', 'cladogram'), 
                      show.tip.label = TRUE,
@@ -16,6 +13,7 @@
                      ...
             )
 {
+    require(grid)
     width <- height <- 0.9
     type <- match.arg(type)
     phy.orig <- phy