[Phylobase-commits] r576 - pkg/inst/unitTests

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

Author: francois
Date: 2009-08-24 05:37:01 +0200 (Mon, 24 Aug 2009)
New Revision: 576

Modified:
   pkg/inst/unitTests/runit.phylo4d.R
Log:
fixed bug in attaching all.data with brute force method

Modified: pkg/inst/unitTests/runit.phylo4d.R
===================================================================
--- pkg/inst/unitTests/runit.phylo4d.R	2009-08-24 03:35:58 UTC (rev 575)
+++ pkg/inst/unitTests/runit.phylo4d.R	2009-08-24 03:37:01 UTC (rev 576)
@@ -27,8 +27,8 @@
 
     ## brute force: no matching; with all.data
     zz <- phylo4d(tr, all.data=aDt, match.data=FALSE)
-    checkEquals(zz at tip.data[,1], aDt[nodeId(tr, "tip"),1])
-    checkEquals(zz at node.data[,1], aDt[nodeId(tr, "internal"),1])
+    checkEquals(zz at tip.data[,1], aDt[1:nTips(tr),1])
+    checkEquals(zz at node.data[,1], aDt[(nTips(tr)+1):(nTips(tr)+nNodes(tr)),1])
     checkEquals(tdata(zz, "all")[,1], aDt[,1])
 
     ## brute force: no matching; with tip & node data