git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/rTRM@80840 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -112,8 +112,9 @@ layout.arc = function (g, target, query) |
112 | 112 |
target = target[target %in% query] |
113 | 113 |
|
114 | 114 |
V(g)$type = "bridge" |
115 |
- V(g)[name %in% query]$type = "query" |
|
116 |
- V(g)[name %in% target]$type = "target" |
|
115 |
+ all_name=V(g)$name # could be V(g)[ name %in% query ] but want to avoid "note's" in R CMD check. |
|
116 |
+ V(g)[all_name %in% query]$type = "query" |
|
117 |
+ V(g)[all_name %in% target]$type = "target" |
|
117 | 118 |
|
118 | 119 |
g_con = g |
119 | 120 |
n_left = character() |
... | ... |
@@ -123,9 +124,11 @@ layout.arc = function (g, target, query) |
123 | 124 |
n_left = setdiff(V(g)$name,V(g_con)$name) |
124 | 125 |
} |
125 | 126 |
|
126 |
- set = list(target = target, bridge=V(g_con)[type == "bridge"]$name, query1 = character(), query2 = character(), query3 = character(), left=n_left) |
|
127 |
- for(q in V(g_con)[type == "query"]$name) { |
|
128 |
- sp = get.all.shortest.paths(g_con,from=V(g_con)[q],to=V(g_con)[name %in% target]) |
|
127 |
+ all_type=V(g_con)$type |
|
128 |
+ all_name=V(g_con)$name |
|
129 |
+ set = list(target = target, bridge=V(g_con)[all_type == "bridge"]$name, query1 = character(), query2 = character(), query3 = character(), left=n_left) |
|
130 |
+ for(q in V(g_con)[all_type == "query"]$name) { |
|
131 |
+ sp = get.all.shortest.paths(g_con,from=V(g_con)[q],to=V(g_con)[all_name %in% target]) |
|
129 | 132 |
#print(sp) |
130 | 133 |
sp_min = min(sapply(sp$res,length)) |
131 | 134 |
#print(sp_min) |