[Phylobase-commits] r572 - pkg/R

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

Author: francois
Date: 2009-08-23 23:41:49 +0200 (Sun, 23 Aug 2009)
New Revision: 572

Modified:
   pkg/R/checkdata.R
   pkg/R/class-phylo4d.R
   pkg/R/readNexus.R
Log:
fixed bug similar to #599 in the case of match.data=FALSE, fixed mispelling in readNexus

Modified: pkg/R/checkdata.R
===================================================================
--- pkg/R/checkdata.R	2009-08-23 17:36:40 UTC (rev 571)
+++ pkg/R/checkdata.R	2009-08-23 21:41:49 UTC (rev 572)
@@ -312,7 +312,7 @@
                    warn = warning(msg),
                    fail = stop(msg))
         }
-        tmpDt <- dt[1:min(nrow(dt), nr) ,, drop = FALSE]
+        tmpDt[,] <- dt[1:min(nrow(dt), nr) ,, drop = FALSE]
     }
 
     tmpDt

Modified: pkg/R/class-phylo4d.R
===================================================================
--- pkg/R/class-phylo4d.R	2009-08-23 17:36:40 UTC (rev 571)
+++ pkg/R/class-phylo4d.R	2009-08-23 21:41:49 UTC (rev 572)
@@ -207,7 +207,7 @@
         x$node.label <- NULL
         nlab.data[!nzchar(nlab.data)] <- NA
 
-        nlab.data <- data.frame(labelValues=as.numeric(nlab.data))
+        nlab.data <- data.frame(labelValues=as.numeric(nlab.data))        
 
         tree <- phylo4(x, check.node.labels="drop")
         res <- phylo4d(tree, tip.data, node.data, all.data, ...)

Modified: pkg/R/readNexus.R
===================================================================
--- pkg/R/readNexus.R	2009-08-23 17:36:40 UTC (rev 571)
+++ pkg/R/readNexus.R	2009-08-23 21:41:49 UTC (rev 572)
@@ -19,7 +19,7 @@
     ##                     constructor
 
     type <- match.arg(type)
-    check.node.label <- match.arg(check.node.labels)
+    check.node.labels <- match.arg(check.node.labels)
 
     output <- c("Failure")
     if (type == "all" || type == "data") {