several fixes

[ape.git] / R / collapse.singles.R

diff --git a/R/collapse.singles.R b/R/collapse.singles.R
index ad3cd985bd6bbb90006b8a8b18c33cd6989c38ae..bbde0a17e003ce464a68dab76afa7d4aa412b416 100644 (file)
--- a/R/collapse.singles.R
+++ b/R/collapse.singles.R
@@ -1,4 +1,4 @@
-## collapse.singles.R (2008-06-19)
+## collapse.singles.R (2010-07-23)
 
 ##    Collapse "Single" Nodes
 
@@ -12,9 +12,9 @@ collapse.singles <- function(tree)
     elen <- tree$edge.length
     xmat <- tree$edge
     ## added by Elizabeth Purdom (2008-06-19):
-    node.lab<-tree$node.label
-    nnode<-tree$Nnode
-    ntip<-length(tree$tip.label)
+    node.lab <- tree$node.label
+    nnode <- tree$Nnode
+    ntip <- length(tree$tip.label)
     ## end
     singles <- NA
     while (length(singles) > 0) {
@@ -29,15 +29,15 @@ collapse.singles <- function(tree)
             prev.node <- which(xmat[, 2] == i)
             next.node <- which(xmat[, 1] == i)
             xmat[prev.node, 2] <- xmat[next.node, 2]
-            xmat <- xmat[xmat[, 1] != i, ] ## drop
+            xmat <- xmat[xmat[, 1] != i, ] # drop
             ## changed by EP for the new coding of "phylo" (2006-10-05):
             ## xmat[xmat < i] <- xmat[xmat < i] + 1 ## adjust indices
-            xmat[xmat > i] <- xmat[xmat > i] - 1 ## adjust indices
+            xmat[xmat > i] <- xmat[xmat > i] - 1L ## adjust indices # changed '1' by '1L' (2010-07-23)
             ## END
             elen[prev.node] <- elen[prev.node] + elen[next.node]
             ## added by Elizabeth Purdom (2008-06-19):
-            if(!is.null(node.lab)) node.lab<-node.lab[-c(i-ntip)]
-            nnode<-nnode-1
+            if (!is.null(node.lab)) node.lab <- node.lab[-c(i - ntip)]
+            nnode <- nnode - 1L
             ## end
             elen <- elen[-next.node]
         }
@@ -45,8 +45,8 @@ collapse.singles <- function(tree)
     tree$edge <- xmat
     tree$edge.length <- elen
     ## added by Elizabeth Purdom (2008-06-19):
-    tree$node.label<-node.lab
-    tree$Nnode<-nnode
+    tree$node.label <- node.lab
+    tree$Nnode <- nnode
     ## end
     tree
 }