Browse code

Minor compatibility update (igraph)

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

Panos Balomenos authored on 24/07/2017 20:43:17
Showing 5 changed files

... ...
@@ -1,12 +1,11 @@
1 1
 Package: DEsubs
2
-Version: 1.3.0
3
-Date: 2015-07-19
2
+Version: 1.3.1
3
+Date: 2017-07-23
4 4
 Title: DEsubs: an R package for flexible identification of
5 5
         differentially expressed subpathways using RNA-seq expression
6 6
         experiments
7 7
 Author: Aristidis G. Vrahatis and Panos Balomenos
8
-Maintainer: Aristidis G. Vrahatis <agvrahatis@upatras.gr> and Panos
9
-        Balomenos <balomenos@upatras.gr>
8
+Maintainer: Aristidis G. Vrahatis <agvrahatis@upatras.gr>, Panos Balomenos <balomenos@upatras.gr>
10 9
 Description: DEsubs is a network-based systems biology package that
11 10
         extracts disease-perturbed subpathways within a pathway network
12 11
         as recorded by RNA-seq experiments. It contains an extensive
... ...
@@ -34,7 +34,7 @@ importFrom( 'graph',
34 34
 importFrom( 'RBGL',
35 35
                 'kCliques')
36 36
 importFrom( 'igraph',
37
-                'as_graphnel',
37
+                'igraph.to.graphNEL',
38 38
                 'graph_from_edgelist',
39 39
                 'as_data_frame',
40 40
                 'closeness',
... ...
@@ -91,9 +91,11 @@ geneVisualization <- function ( DEsubs.out,
91 91
     # Analysis #3
92 92
     if (  measures.barplot )
93 93
     {
94
-
95
-        names(topGenes) <- .changeAnnotation(annData=names(topGenes), 
96
-                                    org='hsa', choice='entrezToHGNC')
94
+        if ( org == 'hsa' )
95
+        {
96
+            names(topGenes) <- .changeAnnotation(annData=names(topGenes), 
97
+                                        org='hsa', choice='entrezToHGNC')
98
+        }
97 99
 
98 100
         .matrixVisualization( -log10(topGenes), type='barplot', title='',
99 101
                             colors=colors.barplot, 
... ...
@@ -158,9 +160,12 @@ geneVisualization <- function ( DEsubs.out,
158 160
 
159 161
     if ( visualize )
160 162
     {
161
-        rownames(ranking) <- .changeAnnotation( annData=rownames(ranking), 
162
-                                                org='hsa',
163
-                                                choice='entrezToHGNC')
163
+        if (org == 'hsa')
164
+        {
165
+            rownames(ranking) <- .changeAnnotation( annData=rownames(ranking), 
166
+                                                    org='hsa',
167
+                                                    choice='entrezToHGNC')
168
+        }
164 169
 
165 170
         .matrixVisualization( dataVis=as.matrix(ranking), 
166 171
                                 type='heatmap', title='topological',
... ...
@@ -315,7 +315,8 @@ subpathwayTypes <- function(grouping='all')
315 315
             p <- gsub('-cliques', '', method)
316 316
             k <- as.numeric(gsub('component.', '', p))
317 317
 
318
-            g <- as_graphnel( gi )
318
+            # g <- as_graphnel( gi )
319
+            g <- igraph.to.graphNEL( gi )
319 320
             ksubs <- kCliques(ugraph(g))[paste0(k, '-cliques')][[1]]
320 321
             ksubs <- lapply(ksubs, function(x) { matrix(x, nrow=1) } )
321 322
 
... ...
@@ -1,3 +1,5 @@
1
+1.3.1:  - Minor compatibility update (igraph).
2
+
1 3
 1.1.3:  - Minor compatibility update.
2 4
 
3 5
 1.1.2:  - All visualization functions now return visualized data.