[adegenet-commits] r264 - pkg/R

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

Author: jombart
Date: 2009-01-30 21:53:58 +0100 (Fri, 30 Jan 2009)
New Revision: 264

Modified:
   pkg/R/auxil.R
Log:
checkType now correctly detects the function in which it is called.


Modified: pkg/R/auxil.R
===================================================================
--- pkg/R/auxil.R	2009-01-28 17:22:37 UTC (rev 263)
+++ pkg/R/auxil.R	2009-01-30 20:53:58 UTC (rev 264)
@@ -109,11 +109,11 @@
 
     if(markType=="codom") return() # always ok for codominant markers
 
-    currCall <- match.call()
+    currCall <- as.character(sys.call(sys.parent()))[1]
     currFunction <- sub("[[:space:]]*[(].*","",currCall)
 
     ## names of functions which are ok for dominant markers
-    PAOk <- c("genind","genpop","genind2genpop","summary",
+    PAOk <- c("genind","genpop","genind2genpop","summary","df2genind",
                  "truenames","seppop","na.replace","nLoc","scaleGen","spca","selpop")
 
     PAWarn <- c("df2genind")