[Mattice-commits] r162 - pkg/R

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

Author: andrew_hipp
Date: 2009-01-17 02:48:54 +0100 (Sat, 17 Jan 2009)
New Revision: 162

Modified:
   pkg/R/batchHansen.R
Log:
using F in %in% was causing a build error... corrected

Modified: pkg/R/batchHansen.R
===================================================================
--- pkg/R/batchHansen.R	2009-01-17 01:45:56 UTC (rev 161)
+++ pkg/R/batchHansen.R	2009-01-17 01:48:54 UTC (rev 162)
@@ -21,7 +21,7 @@
   ## do all the objects in ouchTrees inherit ouchtree?
   if(is(ouchTrees,'ouchtree')) ouchTrees <- list(ouchTrees)
   treeCheck <- unlist(lapply(ouchTrees, function(x) is(x,'ouchtree')))
-  if(F %in% treeCheck) 
+  if(FALSE %in% treeCheck) 
         stop(paste('This function has been rewritten to use the new S4 ', sQuote('ouchtree'), ' class.',
 	'\nYou can generate a tree of this class by calling ', sQuote('ouchtree()'), '.', sep = ""))
   
@@ -31,7 +31,7 @@
     stopFlag <- F
     tree <- ouchTrees[[i]]
     terminals <- tree at nodelabels[(tree at nnodes - tree at nterm + 1):tree at nnodes]
-    if(any(F %in% (terminals %in% names(characterStates)))) {
+    if(any(FALSE %in% (terminals %in% names(characterStates)))) {
       message(paste("Not every terminal branch in tree", i, "has a corresponding name in", sQuote("characterStates")))
       if(length(characterStates) == tree at nterm) {
         message("Data assumed to be in the same order as terminals")