[adegenet-commits] r380 - pkg/R

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

Author: jombart
Date: 2009-06-08 12:59:23 +0200 (Mon, 08 Jun 2009)
New Revision: 380

Modified:
   pkg/R/haploSim.R
Log:
All is pretty much fixed, now have to add procedures to rephrase results.


Modified: pkg/R/haploSim.R
===================================================================
--- pkg/R/haploSim.R	2009-06-08 10:07:05 UTC (rev 379)
+++ pkg/R/haploSim.R	2009-06-08 10:59:23 UTC (rev 380)
@@ -364,6 +364,13 @@
     myX <- dist.dna(x$seq, model="raw")
     seq.names <- labels(x)
     seq.dates <- as.POSIXct(x)
+    seq.length <- ncol(x$seq)
+    prevCall <- as.list(x$call)
+    if(is.null(prevCall$mu)){
+        mu0 <- 0.0001
+    } else {
+        mu0 <- eval(prevCall$mu)
+    }
     res <- seqTrack(myX, seq.names=seq.names, seq.dates=seq.dates, optim=optim, proxMat=proxMat,...)
     return(res)
 }