[adegenet-commits] r785 - pkg/R

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

Author: jombart
Date: 2011-01-26 17:45:46 +0100 (Wed, 26 Jan 2011)
New Revision: 785

Modified:
   pkg/R/import.R
Log:
Fixed the treatment of erroneous info.


Modified: pkg/R/import.R
===================================================================
--- pkg/R/import.R	2011-01-26 15:59:54 UTC (rev 784)
+++ pkg/R/import.R	2011-01-26 16:45:46 UTC (rev 785)
@@ -719,7 +719,7 @@
 #######################
 # Function read.snp
 #######################
-read.snp <- function(file, quiet=FALSE, chunkSize=5,
+read.snp <- function(file, quiet=FALSE, chunkSize=10,
                   multicore=require("multicore"), n.cores=NULL, ...){
     ##ext <- .readExt(file)
     ##ext <- toupper(ext)
@@ -881,8 +881,6 @@
     ind.names <- names(res)
     if(!is.null(misc.info$chromosome)){
         other <- list(chromosome = misc.info$chromosome)
-    } else {
-        other <- list()
     }
 
     res <- new("genlight", gen=res, ind.names=ind.names, loc.names=misc.info$position, loc.all=misc.info$allele, ploidy=misc.info$ploidy, pop=misc.info$population, other=other)