[adegenet-commits] r71 - in pkg: . R

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

Author: jombart
Date: 2008-03-17 15:13:29 +0100 (Mon, 17 Mar 2008)
New Revision: 71

Modified:
   pkg/R/import.R
   pkg/TODO
Log:
Fixed df2genind. 


Modified: pkg/R/import.R
===================================================================
--- pkg/R/import.R	2008-03-17 13:40:49 UTC (rev 70)
+++ pkg/R/import.R	2008-03-17 14:13:29 UTC (rev 71)
@@ -91,9 +91,11 @@
     temp <- apply(X,1,function(c) all(c==missTyp))
     if(any(temp)){
         X <- X[!temp,]
+        pop <- pop[!temp]
+        ind.names <- ind.names[!temp]
         warning("entirely non-type individual(s) deleted")        
     }
-    pop <- pop[!temp]
+    
     n <- nrow(X)
     # ind.names <- rownames(X) this erases the real labels
     # note: if X is kept as a matrix, duplicate row names are no problem

Modified: pkg/TODO
===================================================================
--- pkg/TODO	2008-03-17 13:40:49 UTC (rev 70)
+++ pkg/TODO	2008-03-17 14:13:29 UTC (rev 71)
@@ -26,7 +26,7 @@
 
 # CODE ISSUES:
 ==============
-* 
+* df2genind fails when entirely non-type individuals exist -- done (TJ)
 
 # DOCUMENTATION ISSUES:
 =======================
@@ -35,6 +35,7 @@
 # NEW IMPLEMENTATIONS:
 =====================
 * Implement "sep" argument in df2genind
+* Implement a method to merge different markers for the same individuals
 *
 
 # TESTING: