[Phylobase-commits] r616 - pkg/R

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

Author: francois
Date: 2009-09-03 03:06:36 +0200 (Thu, 03 Sep 2009)
New Revision: 616

Modified:
   pkg/R/formatData.R
Log:
fix 2 bugs: column with tip labels was inserted in the data with option label.type='column' and label.type='column' didn't work if only 1 data column

Modified: pkg/R/formatData.R
===================================================================
--- pkg/R/formatData.R	2009-09-02 23:47:29 UTC (rev 615)
+++ pkg/R/formatData.R	2009-09-03 01:06:36 UTC (rev 616)
@@ -83,8 +83,8 @@
         ## Format data to have correct dimensions
         dt <- dt[!is.na(ndDt) ,, drop=FALSE]
         rownames(dt) <- ndDt[!is.na(ndDt)]
-        if(label.type == "column") dt <- dt[, -label.column]
         tmpDt[,] <- dt[match(rownames(tmpDt), rownames(dt)) ,, drop=FALSE]
+        if(label.type == "column") tmpDt <- tmpDt[, -label.column, drop=FALSE]
     }
     else {
         ## Remove rownames in data provided