[Phylobase-commits] r864 - pkg/tests

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

Author: francois
Date: 2014-03-14 19:21:03 +0100 (Fri, 14 Mar 2014)
New Revision: 864

Modified:
   pkg/tests/phylotorture.R
   pkg/tests/phylotorture.Rout.save
Log:
updated phylotorture

Modified: pkg/tests/phylotorture.R
===================================================================
--- pkg/tests/phylotorture.R	2014-03-10 16:49:08 UTC (rev 863)
+++ pkg/tests/phylotorture.R	2014-03-14 18:21:03 UTC (rev 864)
@@ -1,5 +1,6 @@
 ## torture-testing phylo4 objects.
 require(phylobase)
+require(ape)
 set.seed(1001)
 p1 <- list()
 n <- 10

Modified: pkg/tests/phylotorture.Rout.save
===================================================================
--- pkg/tests/phylotorture.Rout.save	2014-03-10 16:49:08 UTC (rev 863)
+++ pkg/tests/phylotorture.Rout.save	2014-03-14 18:21:03 UTC (rev 864)
@@ -1,6 +1,6 @@
 
-R version 3.0.2 (2013-09-25) -- "Frisbee Sailing"
-Copyright (C) 2013 The R Foundation for Statistical Computing
+R version 3.0.3 (2014-03-06) -- "Warm Puppy"
+Copyright (C) 2014 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -17,16 +17,19 @@
 'help.start()' for an HTML browser interface to help.
 Type 'q()' to quit R.
 
+[Previously saved workspace restored]
+
 > ## torture-testing phylo4 objects.
 > require(phylobase)
 Loading required package: phylobase
 Loading required package: grid
+Loading required package: Rcpp
+> require(ape)
 Loading required package: ape
-Loading required package: Rcpp
 
-Attaching package: ‘phylobase’
+Attaching package: ‘ape’
 
-The following object is masked from ‘package:ape’:
+The following object is masked from ‘package:phylobase’:
 
     edges
 
@@ -217,4 +220,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  5.551   0.181   5.773 
+  5.799   0.194   5.971