[adegenet-commits] r593 - pkg/R www

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

Author: jombart
Date: 2010-04-15 17:30:49 +0200 (Thu, 15 Apr 2010)
New Revision: 593

Modified:
   pkg/R/haploPop.R
   www/contact.html
Log:
...


Modified: pkg/R/haploPop.R
===================================================================
--- pkg/R/haploPop.R	2010-03-29 10:58:16 UTC (rev 592)
+++ pkg/R/haploPop.R	2010-04-15 15:30:49 UTC (rev 593)
@@ -99,13 +99,13 @@
 
             ## generate new strains for new generation
             sampSize <- round(min( length(myPop)*birth.func(), myS)) # number of strains for next step
-            if(sampSize<1){ # if no sample
+            if(sampSize<1){ # if no new strains
                 ## old strains die
                 toKill <- death.func(myAge)
                 myPop[toKill] <- NULL
                 myAge <- myAge[!toKill]
                 return(list(pop=myPop, S=myS, age=myAge))
-            }
+            } # if there are new strains, do...
             newGen <- myPop[sample(1:length(myPop), sampSize, replace=TRUE)] # sample strains for new generations
             newGen <- assignMutations(newGen, createMutations(sampSize)) # mutate strains
             newAge <- rep(0, sampSize) # new ages for newborns

Modified: www/contact.html
===================================================================
--- www/contact.html	2010-03-29 10:58:16 UTC (rev 592)
+++ www/contact.html	2010-04-15 15:30:49 UTC (rev 593)
@@ -26,7 +26,8 @@
  target="_top">there</a><br>
 - <a
  href="http://lists.r-forge.r-project.org/pipermail/adegenet-forum/">browsable
-archives</a> of adegenet forum.<br>
+archives</a> of adegenet forum; to search the archives, google keywords
+preceeded with 'adegenet-forum'.<br>
 - the <a target="_top"
  href="https://stat.ethz.ch/mailman/listinfo/r-sig-genetics">R-sig-genetics</a>
 mailing list, for general questions about the analysis of genetic