[Adephylo-commits] r122 - pkg/R

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

Author: jombart
Date: 2009-11-05 11:23:42 +0100 (Thu, 05 Nov 2009)
New Revision: 122

Modified:
   pkg/R/abouheif.R
   pkg/R/ppca.R
Log:
commented calls to checkData


Modified: pkg/R/abouheif.R
===================================================================
--- pkg/R/abouheif.R	2009-01-19 11:00:06 UTC (rev 121)
+++ pkg/R/abouheif.R	2009-11-05 10:23:42 UTC (rev 122)
@@ -15,7 +15,7 @@
     } else { # otherwise computed W from x, a phylo4d object
         if(!inherits(x, "phylo4d")) stop("if W is not provided, x has to be a phylo4d object")
         if (is.character(chk <- checkPhylo4(x))) stop("bad phylo4d object: ",chk)
-        if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk)
+        ##if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk) no longer needed
         W <- proxTips(x, method=method, a=a, normalize="row", symmetric=TRUE)
     }
 
@@ -26,7 +26,7 @@
     ## take data from x if it is a phylo4d
     if(inherits(x, "phylo4d")){
         if (is.character(chk <- checkPhylo4(x))) stop("bad phylo4d object: ",chk)
-        if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk)
+        ## if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk) : no longer needed
         x <- tdata(x)
     }
 

Modified: pkg/R/ppca.R
===================================================================
--- pkg/R/ppca.R	2009-01-19 11:00:06 UTC (rev 121)
+++ pkg/R/ppca.R	2009-11-05 10:23:42 UTC (rev 122)
@@ -12,7 +12,7 @@
     ## handle arguments
     if(!require(ade4)) stop("The package ade4 is not installed.")
     if (is.character(chk <- checkPhylo4(x))) stop("bad phylo4d object: ",chk)
-    if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk)
+    ##if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk) : no longer needed
 
     tre <- as(x, "phylo4")
     method <- match.arg(method)