[Phylobase-commits] r224 - branches/pdcgsoc/R

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

Author: pdc
Date: 2008-08-02 11:17:29 +0200 (Sat, 02 Aug 2008)
New Revision: 224

Modified:
   branches/pdcgsoc/R/methods-phylo4.R
   branches/pdcgsoc/R/methods-phylo4d.R
Log:
fix missed variable name changes

Modified: branches/pdcgsoc/R/methods-phylo4.R
===================================================================
--- branches/pdcgsoc/R/methods-phylo4.R	2008-08-02 08:41:58 UTC (rev 223)
+++ branches/pdcgsoc/R/methods-phylo4.R	2008-08-02 09:17:29 UTC (rev 224)
@@ -311,11 +311,11 @@
         }
         c(nord, which(index))
     }
-    if(type == 'pruningwise') {
-        index <- reorder.prune(object at edge, length(object at tip.label))
+    if(order == 'pruningwise') {
+        index <- reorder.prune(x at edge, length(x at tip.label))
     }
-    object at edge        <- object at edge[index, ]
-    object at edge.label  <- object at edge.label[index]
-    object at edge.length <- object at edge.length[index]
-    object
+    x at edge        <- x at edge[index, ]
+    x at edge.label  <- x at edge.label[index]
+    x at edge.length <- x at edge.length[index]
+    x
 })

Modified: branches/pdcgsoc/R/methods-phylo4d.R
===================================================================
--- branches/pdcgsoc/R/methods-phylo4d.R	2008-08-02 08:41:58 UTC (rev 223)
+++ branches/pdcgsoc/R/methods-phylo4d.R	2008-08-02 09:17:29 UTC (rev 224)
@@ -173,11 +173,11 @@
         }
         c(nord, which(index))
     }
-    if(type == 'pruningwise') {
-        index <- reorder.prune(object at edge, length(object at tip.label))
+    if(order == 'pruningwise') {
+        index <- reorder.prune(x at edge, length(x at tip.label))
     }
-    object at edge        <- object at edge[index, ]
-    object at edge.label  <- object at edge.label[index]
-    object at edge.length <- object at edge.length[index]
-    object
+    x at edge        <- x at edge[index, ]
+    x at edge.label  <- x at edge.label[index]
+    x at edge.length <- x at edge.length[index]
+    x
 })