[adegenet-commits] r423 - pkg/R

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

Author: jombart
Date: 2009-06-23 15:07:51 +0200 (Tue, 23 Jun 2009)
New Revision: 423

Modified:
   pkg/R/haploSim.R
Log:
atcha


Modified: pkg/R/haploSim.R
===================================================================
--- pkg/R/haploSim.R	2009-06-23 12:17:06 UTC (rev 422)
+++ pkg/R/haploSim.R	2009-06-23 13:07:51 UTC (rev 423)
@@ -393,7 +393,9 @@
 ## optimize.seqTrack.haploSim
 ##############################
 optimize.seqTrack.haploSim <- function(x, thres=0.2, optim=c("min","max"),
-                              prox.mat=NULL, nstep=10, step.size=1e3, rMissDate=.rUnifTimeSeq, ...){
+                                       typed.chr=NULL, mu0=NULL, chr.length=NULL,
+                                       prox.mat=NULL, nstep=10, step.size=1e3,
+                                       rDate=.rTimeSeq, arg.rDate=NULL, rMissDate=.rUnifTimeSeq, ...){
 
     x.names <- labels(x)
     x.dates <- as.POSIXct(x)
@@ -407,9 +409,10 @@
     }
 
     res <- optimize.seqTrack.default(x=myX, x.names=x.names, x.dates=x.dates,
+                                     typed.chr=typed.chr, mu0=mu0, chr.length=chr.length,
                                      thres=thres, optim=optim, prox.mat=prox.mat,
-                                     nstep=nstep, step.size=step.size, mu0=mu0,
-                                     seq.length=seq.length, rMissDate=rMissDate, ...)
+                                     nstep=nstep, step.size=step.size,
+                                     rDate=rDate, arg.rDate=arg.rDate, rMissDate=rMissDate, ...)
 } # end optimize.seqTrack.haploSim