[Phylobase-commits] r880 - pkg/tests

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

Author: francois
Date: 2014-03-17 14:29:22 +0100 (Mon, 17 Mar 2014)
New Revision: 880

Modified:
   pkg/tests/phylotorture.R
   pkg/tests/phylotorture.Rout.save
Log:
final tweaks to phylotorture

Modified: pkg/tests/phylotorture.R
===================================================================
--- pkg/tests/phylotorture.R	2014-03-17 13:19:26 UTC (rev 879)
+++ pkg/tests/phylotorture.R	2014-03-17 13:29:22 UTC (rev 880)
@@ -21,7 +21,7 @@
 ## table(sapply(p1[!OKvals], as.character)) # I think this is causing issues with
 ##  R check because of different width of terminal/output, trying something simpler:
 message(unique(sapply(p1[!OKvals], as.character)))
-unname(table(sapply(p1[!OKvals], as.character)))
+sort(unname(table(sapply(p1[!OKvals], as.character))))
 if (sum(OKvals))     message("There are ", sum(OKvals), " valid trees...")
 
 if (any(OKvals)) {

Modified: pkg/tests/phylotorture.Rout.save
===================================================================
--- pkg/tests/phylotorture.Rout.save	2014-03-17 13:19:26 UTC (rev 879)
+++ pkg/tests/phylotorture.Rout.save	2014-03-17 13:29:22 UTC (rev 880)
@@ -55,8 +55,8 @@
   'names' attribute [2] must be the same length as the vector [1]
 Error in .local(x, ...) : Nodes incorrectly labeled. 
 
-> unname(table(sapply(p1[!OKvals], as.character)))
-[1]  3 53 44
+> sort(unname(table(sapply(p1[!OKvals], as.character))))
+[1]  3 44 53
 > if (sum(OKvals))     message("There are ", sum(OKvals), " valid trees...")
 There are 100 valid trees...
 >