[adegenet-commits] r528 - pkg/R

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

Author: jombart
Date: 2010-01-11 13:12:42 +0100 (Mon, 11 Jan 2010)
New Revision: 528

Modified:
   pkg/R/haploPop.R
Log:
small fix to take 'quiet' into account when pop go extinct


Modified: pkg/R/haploPop.R
===================================================================
--- pkg/R/haploPop.R	2010-01-08 17:40:37 UTC (rev 527)
+++ pkg/R/haploPop.R	2010-01-11 12:12:42 UTC (rev 528)
@@ -248,7 +248,7 @@
         listAges <- listAges[toKeep]
 
         ## stop if all pop go extinct
-        if(length(listPop)==0L){
+        if(length(listPop)==0L & !quiet){
             cat("\n All populations went extinct at time",i,"\n")
             return(invisible(NULL))
         }
@@ -890,7 +890,7 @@
         listAges <- listAges[toKeep]
 
         ## stop if all pop go extinct
-        if(length(listPop)==0L){
+        if(length(listPop)==0L & !quiet){
             cat("\n All populations went extinct at time",i,"\n")
 
               return(res)