[adegenet-commits] r529 - pkg/R

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

Author: jombart
Date: 2010-01-11 13:14:30 +0100 (Mon, 11 Jan 2010)
New Revision: 529

Modified:
   pkg/R/haploPop.R
Log:
same thng, well done.


Modified: pkg/R/haploPop.R
===================================================================
--- pkg/R/haploPop.R	2010-01-11 12:12:42 UTC (rev 528)
+++ pkg/R/haploPop.R	2010-01-11 12:14:30 UTC (rev 529)
@@ -248,8 +248,8 @@
         listAges <- listAges[toKeep]
 
         ## stop if all pop go extinct
-        if(length(listPop)==0L & !quiet){
-            cat("\n All populations went extinct at time",i,"\n")
+        if(length(listPop)==0L){
+            if(!quiet) cat("\n All populations went extinct at time",i,"\n")
             return(invisible(NULL))
         }
 
@@ -890,10 +890,9 @@
         listAges <- listAges[toKeep]
 
         ## stop if all pop go extinct
-        if(length(listPop)==0L & !quiet){
-            cat("\n All populations went extinct at time",i,"\n")
-
-              return(res)
+        if(length(listPop)==0L){
+            if(!quiet) cat("\n All populations went extinct at time",i,"\n")
+            return(res)
         }
 
         res$div[[i]] <- fRes(listPop)