Browse code

LJ: Bug fix, removed NCIgraph dependency.

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/DEGraph@54155 bc3139a8-67e5-0310-9ffc-ced21a209358

Laurent Jacob authored on 29/03/2011 23:02:01
Showing 5 changed files

... ...
@@ -16,7 +16,7 @@ Description: DEGraph implements recent hypothesis testing methods
16 16
   and tools to visualize the results.
17 17
 License: GPL-3
18 18
 LazyLoad: yes
19
-Imports: graph, KEGGgraph, lattice, mvtnorm, NCIgraph, R.methodsS3, RBGL, Rgraphviz, rrcov
20
-Suggests: corpcor, fields, graph, KEGGgraph, lattice, marray, NCIgraph, RBGL, rrcov, Rgraphviz
19
+Imports: graph, KEGGgraph, lattice, mvtnorm, R.methodsS3, RBGL, Rgraphviz, rrcov
20
+Suggests: corpcor, fields, graph, KEGGgraph, lattice, marray, RBGL, rrcov, Rgraphviz
21 21
 Depends: R (>= 2.10.0), R.utils
22 22
 biocViews: Microarray, Bioinformatics, DifferentialExpression, GraphsAndNetworks
... ...
@@ -25,4 +25,4 @@ importFrom(rrcov, T2.test)
25 25
 importFrom(mvtnorm, rmvnorm)
26 26
 importFrom(RBGL,connectedComp)
27 27
 importFrom(lattice, level.colors)
28
-importFrom(NCIgraph, is.NCIgraph)
28
+## importFrom(NCIgraph, is.NCIgraph)
29 29
new file mode 100644
... ...
@@ -0,0 +1,48 @@
1
+## Copyright 2011 Laurent Jacob
2
+
3
+## This file is part of DEGraph.
4
+
5
+## DEGraph is free software: you can redistribute it and/or modify
6
+## it under the terms of the GNU General Public License as published by
7
+## the Free Software Foundation, either version 3 of the License, or
8
+## (at your option) any later version.
9
+
10
+## DEGraph is distributed in the hope that it will be useful,
11
+## but WITHOUT ANY WARRANTY without even the implied warranty of
12
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
+## GNU General Public License for more details.
14
+
15
+## You should have received a copy of the GNU General Public License
16
+## along with DEGraph.  If not, see <http://www.gnu.org/licenses/>.
17
+
18
+#########################################################################/**
19
+# @RdocFunction is.NCIgraph
20
+##
21
+## @title "Assess whether a graph is a NCI graph"
22
+##
23
+##
24
+## \description{
25
+##  @get "title".
26
+## }
27
+##
28
+## @synopsis
29
+##
30
+## \arguments{
31
+##   \item{gr}{A \code{\link[=graph-class]{graph}} object.}
32
+## }
33
+##
34
+## \value{A @logical, @TRUE if the graph is a NCI graph, @FALSE otherwise.}
35
+##
36
+## @author
37
+##
38
+## \seealso{
39
+##   @see "parseNCInetwork"
40
+## }
41
+##
42
+##*/########################################################################
43
+
44
+is.NCIgraph <- function(gr)
45
+  {
46
+    ##(length(gr@nodeData@data) > 0) && (length(grep('biopax',names(gr@nodeData@data[[1]]))) > 0)
47
+    isTRUE(class(gr) == 'NCIgraph')
48
+  }
... ...
@@ -19,19 +19,17 @@ sourceDirectory(path)
19 19
 ## get all NCI pathways
20 20
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
21 21
 
22
-##library('NCIgraph')
23
-##path <- system.file("downloadScripts", package="NCIgraph")
24
-##sourceDirectory(path)
25
-##load(file.path('rawNCINetworks','NCI-cyList.RData'))
22
+## library('NCIgraph')
23
+path <- system.file("downloadScripts", package="NCIgraph")
24
+sourceDirectory(path)
25
+load(file.path('rawNCINetworks','NCI-cyList.RData'))
26 26
 
27
-##grList <- getNCIPathways(cyList=NCI.cyList, verbose=verbose)$pList
27
+grList <- getNCIPathways(cyList=NCI.cyList, verbose=verbose)$pList
28 28
 
29 29
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
30 30
 ## get all KEGG pathways
31 31
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
32
-
33
-grList <- getKEGGPathways(organism="hsa", metaTag="non-metabolic", verbose=verbose)
34
-
32
+## grList <- getKEGGPathways(organism="hsa", metaTag="non-metabolic", verbose=verbose)
35 33
 ## grList <- getKEGGPathways(organism="hsa", metaTag="non-metabolic", patt="04060", verbose=verbose)
36 34
 
37 35
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
38 36
new file mode 100644
... ...
@@ -0,0 +1,29 @@
1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2
+% Do not modify this file since it was automatically generated from:
3
+% 
4
+%  ./is.NCIgraph.R
5
+% 
6
+% by the Rdoc compiler part of the R.oo package.
7
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
8
+
9
+\name{is.NCIgraph}
10
+\alias{is.NCIgraph}
11
+
12
+
13
+\title{Assess whether a graph is a NCI graph}
14
+
15
+
16
+\description{
17
+ Assess whether a graph is a NCI graph.
18
+}
19
+
20
+\usage{is.NCIgraph(gr)}
21
+
22
+\arguments{
23
+  \item{gr}{A \code{\link[=graph-class]{graph}} object.}
24
+}
25
+
26
+\value{A \code{\link[base]{logical}}, \code{\link[base:logical]{TRUE}} if the graph is a NCI graph, \code{\link[base:logical]{FALSE}} otherwise.}
27
+
28
+\author{Laurent Jacob, Pierre Neuvial and Sandrine Dudoit}
29
+