[adegenet-commits] r642 - pkg/R

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

Author: jombart
Date: 2010-05-21 14:51:56 +0200 (Fri, 21 May 2010)
New Revision: 642

Modified:
   pkg/R/basicMethods.R
   pkg/R/seqTrack.R
Log:
still not working. 
not due to ordering of sources.
fuck.
fuck.
fuck.


Modified: pkg/R/basicMethods.R
===================================================================
--- pkg/R/basicMethods.R	2010-05-21 12:30:25 UTC (rev 641)
+++ pkg/R/basicMethods.R	2010-05-21 12:51:56 UTC (rev 642)
@@ -1,9 +1,5 @@
 
 
-
-
-
-
 setMethod("$","genpop",function(x,name) {
     return(slot(x,name))
 })
@@ -85,7 +81,7 @@
 
 
 ## genpop
-setMethod("[","genpop",
+setMethod("[", "genpop",
           function(x, i, j, ..., loc=NULL, treatOther=TRUE, drop=FALSE) {
 
               if (missing(i)) i <- TRUE

Modified: pkg/R/seqTrack.R
===================================================================
--- pkg/R/seqTrack.R	2010-05-21 12:30:25 UTC (rev 641)
+++ pkg/R/seqTrack.R	2010-05-21 12:51:56 UTC (rev 642)
@@ -324,7 +324,7 @@
 if(require(graph)){
 setOldClass("seqTrack")
 setAs("seqTrack", "graphNEL", def=function(from){
-    if(!require(ape)) stop("package ape is required")
+    ##    if(!require(ape)) stop("package ape is required")
     if(!require(graph)) stop("package graph is required")
 
     ori.labels <- rownames(from)