[adegenet-commits] r781 - pkg/R

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

Author: jombart
Date: 2011-01-26 12:39:32 +0100 (Wed, 26 Jan 2011)
New Revision: 781

Modified:
   pkg/R/SNPbin.R
Log:
fixed the last bug


Modified: pkg/R/SNPbin.R
===================================================================
--- pkg/R/SNPbin.R	2011-01-25 20:17:47 UTC (rev 780)
+++ pkg/R/SNPbin.R	2011-01-26 11:39:32 UTC (rev 781)
@@ -137,9 +137,9 @@
 
 
 
-####################
+########################
 ## genlight constructor
-####################
+########################
 setMethod("initialize", "genlight", function(.Object, ..., multicore=require("multicore"), n.cores=NULL) {
     if(multicore && !require(multicore)) stop("multicore package requested but not installed")
     if(multicore && is.null(n.cores)){
@@ -192,7 +192,7 @@
 
 
         ## input$gen is a list of integers/numeric ##
-        if(is.list(input$gen) && all(sapply(input$gen, class) %in% c("integer","numeric"))){
+        if(is.list(input$gen) && !is.data.frame(input$gen) && all(sapply(input$gen, class) %in% c("integer","numeric"))){
             ## check length consistency
             lengthvec <- sapply(input$gen, length)