[adegenet-commits] r260 - pkg/R

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

Author: jombart
Date: 2009-01-28 12:01:55 +0100 (Wed, 28 Jan 2009)
New Revision: 260

Modified:
   pkg/R/genind2genpop.R
Log:
Remamed f1 -> fOther


Modified: pkg/R/genind2genpop.R
===================================================================
--- pkg/R/genind2genpop.R	2009-01-27 19:35:57 UTC (rev 259)
+++ pkg/R/genind2genpop.R	2009-01-28 11:01:55 UTC (rev 260)
@@ -66,7 +66,7 @@
   res at other <- x at other
   if(proceed.other){
       ## auxiliary function doing the job
-      f1 <- function(e){
+      fOther <- function(e){
           N <- row(x at tab)
           if(is.vector(e) & is.numeric(e) & length(e)==N){ # numeric vector
               res <- tapply(e, pop, other.action)
@@ -81,7 +81,7 @@
           } else return(e)
       } # end f1
 
-      res at other <- lapply(res at other, f1)
+      res at other <- lapply(res at other, fOther)
   } # end if(proceed.other)
 
   if(missing != "NA"){