fix error that was breaking build

Author: epurdom

R/AllChecks.R

@@ -115,9 +115,10 @@
     if(object@merge_index==object@merge_dendrocluster_index) return("merge_index should not be same as merge_dendrocluster_index")
     if(!length(object@merge_method)==1) return("merge_method must be of length 1")
     if(!object@merge_method %in% .availMergeMethods) return(paste("merge_method must be one of available merge methods:", paste(.availMergeMethods,collapse=",")))
-    # if(ncol(object@merge_nodeMerge)!=4 || any(sort(colnames(object@merge_nodeMerge)) != c('Contrast','isMerged','mergeClusterId','Node') )) {
-    #   return("merge_nodeMerge must have 4 columns and column names equal to: 'Node','Contrast','isMerged','mergeClusterId'")
-    # }
+	allowMergeColumns<-c('Contrast','isMerged','mergeClusterId','Node')
+    if(ncol(object@merge_nodeMerge)!=length(allowMergeColumns) || any(sort(colnames(object@merge_nodeMerge)) !=  sort(allowMergeColumns))) {
+      return(paste("merge_nodeMerge must have 4 columns and column names equal to:",paste(allowMergeColumns,collapse=",")))
+    }
     if(!is.character(object@merge_nodeMerge[,"Node"])) return("'Node' column of merge_nodeMerge must be character")
     if(!is.character(object@merge_nodeMerge[,"Contrast"])) return("'Contrast' column of merge_nodeMerge must be character")
     if(!is.logical(object@merge_nodeMerge[,"isMerged"])) return("'isMerged' column of merge_nodeMerge must be character")