Browse code

Added NCIgraph to Imports.

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

Pierre Neuvial authored on 23/10/2011 21:49:37
Showing 10 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 Package: DEGraph
2 2
 Title: Two-sample tests on a graph
3
-Version: 1.5.2
4
-Date: 2011-10-18
3
+Version: 1.5.3
4
+Date: 2011-10-23
5 5
 Author: Laurent Jacob, Pierre Neuvial and Sandrine Dudoit
6 6
 Maintainer: Laurent Jacob <laurent.jacob@gmail.com>
7 7
 Description: DEGraph implements recent hypothesis testing methods
... ...
@@ -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, R.methodsS3, RBGL, Rgraphviz, rrcov
19
+Imports: graph, KEGGgraph, lattice, mvtnorm, R.methodsS3, RBGL, Rgraphviz, rrcov, NCIgraph
20 20
 Suggests: corpcor, fields, graph, KEGGgraph, lattice, marray, RBGL, rrcov, Rgraphviz, NCIgraph
21 21
 Depends: R (>= 2.10.0), R.utils
22 22
 biocViews: Microarray, Bioinformatics, DifferentialExpression, GraphsAndNetworks
... ...
@@ -18,7 +18,7 @@ import(graph)
18 18
 import(KEGGgraph)
19 19
 ## importFrom(graph,subGraph, numEdges, validGraph, isDirected, removeEdge)
20 20
 ## importFrom(KEGGGraph, parseKGML, getPathwayInfo, KEGGpathway2Graph, getTitle, getSubtype)
21
-
21
+importFrom(NCIgraph, is.NCIgraph)
22 22
 ##importFrom(KEGGGraph, getKEGGedgeData)
23 23
 
24 24
 ##importFrom(graph, edgeData)
... ...
@@ -1,6 +1,6 @@
1 1
 library("Rgraphviz")
2 2
 library("KEGGgraph")
3
-library("NCIgraph")
3
+## library("NCIgraph")
4 4
 
5 5
 data("Loi2008_DEGraphVignette")
6 6
 exprData <- exprLoi2008
... ...
@@ -1,5 +1,5 @@
1 1
 library("KEGGgraph")
2
-library("NCIgraph")
2
+## library("NCIgraph")
3 3
 library("rrcov")
4 4
 
5 5
 data("Loi2008_DEGraphVignette")
... ...
@@ -116,7 +116,6 @@ library("R.utils")
116 116
 ##library(rrcov) ## for 'T2.test'
117 117
 library(corpcor)
118 118
 library(KEGGgraph)
119
-library(NCIgraph)
120 119
 library(Rgraphviz)
121 120
 ##library(RBGL)
122 121
 library(fields) # For image.plot called in plotValuedGraph
... ...
@@ -50,7 +50,7 @@
50 50
 
51 51
 \examples{
52 52
 library("KEGGgraph")
53
-library("NCIgraph")
53
+## library("NCIgraph")
54 54
 library("rrcov")
55 55
 
56 56
 data("Loi2008_DEGraphVignette")
... ...
@@ -46,7 +46,7 @@
46 46
 
47 47
 \examples{
48 48
 library("KEGGgraph")
49
-library("NCIgraph")
49
+## library("NCIgraph")
50 50
 library("rrcov")
51 51
 
52 52
 data("Loi2008_DEGraphVignette")
... ...
@@ -50,7 +50,7 @@
50 50
 
51 51
 \examples{
52 52
 library("KEGGgraph")
53
-library("NCIgraph")
53
+## library("NCIgraph")
54 54
 library("rrcov")
55 55
 
56 56
 data("Loi2008_DEGraphVignette")
... ...
@@ -61,7 +61,7 @@
61 61
 \examples{
62 62
 library("Rgraphviz")
63 63
 library("KEGGgraph")
64
-library("NCIgraph")
64
+## library("NCIgraph")
65 65
 
66 66
 data("Loi2008_DEGraphVignette")
67 67
 exprData <- exprLoi2008
... ...
@@ -44,7 +44,7 @@
44 44
 \examples{
45 45
 library("Rgraphviz")
46 46
 library("KEGGgraph")
47
-library("NCIgraph")
47
+## library("NCIgraph")
48 48
 
49 49
 data("Loi2008_DEGraphVignette")
50 50
 exprData <- exprLoi2008