[adegenet-commits] r489 - pkg/R

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

Author: jombart
Date: 2009-11-19 12:38:17 +0100 (Thu, 19 Nov 2009)
New Revision: 489

Modified:
   pkg/R/haploPop.R
Log:
Different choice in initialization: nb of initial strains no longer substracted from K


Modified: pkg/R/haploPop.R
===================================================================
--- pkg/R/haploPop.R	2009-11-18 14:54:34 UTC (rev 488)
+++ pkg/R/haploPop.R	2009-11-19 11:38:17 UTC (rev 489)
@@ -141,7 +141,8 @@
     ## INITIATE SIMULATIONS ##
     ## INITIALIZE FROM SCRATCH
     if(is.null(ini.obj)){
-        vecS <- max.pop.size() -  n.snp.ini # susceptibles
+        ##vecS <- max.pop.size() -  n.snp.ini # susceptibles
+        vecS <- max.pop.size() # susceptibles
         if(is.null(ini.haplo)) {
             haplo.ini <- sample(SNP.POOL, n.snp.ini, replace=TRUE)
         } else {
@@ -663,7 +664,8 @@
     ## INITIATE SIMULATIONS ##
     ## INITIALIZE FROM SCRATCH
     if(is.null(ini.obj)){
-        vecS <- max.pop.size() -  n.snp.ini # susceptibles
+        ## vecS <- max.pop.size() -  n.snp.ini # susceptibles
+        vecS <- max.pop.size() # susceptibles
         if(is.null(ini.haplo)) {
             haplo.ini <- sample(SNP.POOL, n.snp.ini, replace=TRUE)
         } else {