[adegenet-commits] r342 - pkg/R

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

Author: jombart
Date: 2009-06-03 00:09:43 +0200 (Wed, 03 Jun 2009)
New Revision: 342

Modified:
   pkg/R/seqTrack.R
Log:
fixes to new optimize.setrack output.


Modified: pkg/R/seqTrack.R
===================================================================
--- pkg/R/seqTrack.R	2009-06-02 15:58:08 UTC (rev 341)
+++ pkg/R/seqTrack.R	2009-06-02 22:09:43 UTC (rev 342)
@@ -469,8 +469,8 @@
             temp <- val.res(res.new)
             if(ifelse(optim=="min", temp < thres, temp > thres)){
                 ances <- cbind(ances, res.new$ances)
-                date <- cbind(date, res.new$date)
-                ances.date <- cbind(ances.date, res.new$ances.date)
+                date <- cbind(date, as.character(res.new$date))
+                ances.date <- cbind(ances.date, as.character(res.new$ances.date))
                 valRes <- c(valRes, temp)
             }
         }
@@ -516,7 +516,7 @@
 
 
     ## RESULT ##
-    res <- list(best=res.best, valsim=valRes)
+    res <- list(ances=ances, date=date, ances.date=ances.date, valsim=valRes)
     return(res)
 
 } # optimize.seqTrack