[Mattice-commits] r196 - pkg/R

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

Author: andrew_hipp
Date: 2009-06-01 09:01:59 +0200 (Mon, 01 Jun 2009)
New Revision: 196

Modified:
   pkg/R/ouSim.ouchtree.R
Log:
ouSim.ouchtree works correctly with zero-length branches

Modified: pkg/R/ouSim.ouchtree.R
===================================================================
--- pkg/R/ouSim.ouchtree.R	2009-06-01 06:59:52 UTC (rev 195)
+++ pkg/R/ouSim.ouchtree.R	2009-06-01 07:01:59 UTC (rev 196)
@@ -7,7 +7,7 @@
 message(paste("running sim with root =", rootState, ", alpha =", mean(alpha), ", var =", variance, "theta =", mean(theta)))
 
 	## embedded function---------------------
-	## could be released to the wild, but more arguments will need to be passed around
+	## could be released to the wild, but more arguments would need to be passed around
 	preorderOU <- function(branchList, tree, startNode, startState, alpha, theta) {
 	  ## Recursive function to generate the data under a Brownian motion or OU model
 	  ## modified for ouchtree (s4) Dec 08
@@ -33,8 +33,6 @@
 	}  
 	## --------------------------------------
 
- #debug(preorderOU)
-
   ## 1. initialize
   if(length(alpha) == 1) alpha <- rep(alpha, tree at nnodes)
   if(length(theta) == 1) theta <- rep(theta, tree at nnodes)