[adegenet-commits] r317 - pkg/R

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

Author: jombart
Date: 2009-05-21 18:52:34 +0200 (Thu, 21 May 2009)
New Revision: 317

Modified:
   pkg/R/seqTrack.R
Log:
improvement concerning ex aequo seems to work.


Modified: pkg/R/seqTrack.R
===================================================================
--- pkg/R/seqTrack.R	2009-05-21 15:08:03 UTC (rev 316)
+++ pkg/R/seqTrack.R	2009-05-21 16:52:34 UTC (rev 317)
@@ -25,6 +25,8 @@
         stop(msg)
     }
 
+    W <- as.matrix(W)
+
     if(!is.null(proxMat) && !identical(dim(proxMat),dim(W))) {
         stop("proxMat is provided but its dimensions are inconsistent with that of W")
     }
@@ -35,6 +37,9 @@
     W <- as.matrix(W)
     ## rename dimensions using id
     colnames(W) <- rownames(W) <- id
+    if(!is.null(proxMat)){
+        colnames(proxMat) <- rownames(proxMat) <- id
+    }
 
     if(length(seq.names) != nrow(W)){
         stop("inconsistent dimension for W")