[Phylobase-commits] r605 - pkg

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

Author: francois
Date: 2009-08-28 01:06:52 +0200 (Fri, 28 Aug 2009)
New Revision: 605

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
Log:
added formatData.R in collate, added hasTipData in namespace

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-08-27 23:06:16 UTC (rev 604)
+++ pkg/DESCRIPTION	2009-08-27 23:06:52 UTC (rev 605)
@@ -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 (>= 2)
-Collate: phylo4.R checkdata.R class-multiphylo4.R class-oldclasses.R class-phylo4.R class-phylo4d.R  class-phylomats.R methods-multiphylo4.R methods-oldclasses.R methods-phylo4.R methods-phylo4d.R setAs-Methods.R pdata.R subset.R prune.R treePlot.R treestruc.R treewalk.R readNexus.R tbind.R zzz.R
+Collate: phylo4.R checkdata.R formatData.R class-multiphylo4.R class-oldclasses.R class-phylo4.R class-phylo4d.R  class-phylomats.R methods-multiphylo4.R methods-oldclasses.R methods-phylo4.R methods-phylo4d.R setAs-Methods.R pdata.R subset.R prune.R treePlot.R treestruc.R treewalk.R readNexus.R tbind.R zzz.R
 URL: http://phylobase.R-forge.R-project.org

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2009-08-27 23:06:16 UTC (rev 604)
+++ pkg/NAMESPACE	2009-08-27 23:06:52 UTC (rev 605)
@@ -37,7 +37,7 @@
 exportMethods(nodeId, nodeType)
 
 # tree data methods
-exportMethods(tdata, "tdata<-", addData, hasNodeData)
+exportMethods(tdata, "tdata<-", addData, hasTipData, hasNodeData)
 
 # prune methods
 exportMethods(prune)
@@ -85,8 +85,8 @@
 #export(internEdges, terminEdges, isPoly)
 
 ## presumably these should remain hidden
-#export(.createLabels, .createEdge, .phylo4Data, orderIndex, .genlab,
-#    .chnumsort, .phylo4ToDataFrame, .bubLegendGrob)
+export(.createLabels, .createEdge, .phylo4Data, orderIndex, .genlab,
+    .chnumsort, .phylo4ToDataFrame, .bubLegendGrob)
 ## hidden: drawDetails.bubLegend)
 
 ## recently removed: