projects
/
mtp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e777319
)
Cosmetics.
author
Francois Fleuret
<francois@fleuret.org>
Sat, 29 Dec 2012 10:37:43 +0000
(11:37 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Sat, 29 Dec 2012 10:37:43 +0000
(11:37 +0100)
mtp_graph.cc
patch
|
blob
|
history
diff --git
a/mtp_graph.cc
b/mtp_graph.cc
index
fcdcfed
..
e83c848
100644
(file)
--- a/
mtp_graph.cc
+++ b/
mtp_graph.cc
@@
-205,9
+205,9
@@
void MTPGraph::compute_dp_ranks() {
// set the distance_from_source fields to this value.
int *nb_predecessors = new int[_nb_vertices];
// set the distance_from_source fields to this value.
int *nb_predecessors = new int[_nb_vertices];
- int *without_predecessor
s
= new int[_nb_vertices];
- int *new_without_predecessor
s
= new int[_nb_vertices];
- int nb_without_predecessor
s, new_nb_without_predecessors
;
+ int *without_predecessor = new int[_nb_vertices];
+ int *new_without_predecessor = new int[_nb_vertices];
+ int nb_without_predecessor
, new_nb_without_predecessor
;
for(int k = 0; k < _nb_vertices; k++) {
nb_predecessors[k] = 0;
for(int k = 0; k < _nb_vertices; k++) {
nb_predecessors[k] = 0;
@@
-221,31
+221,31
@@
void MTPGraph::compute_dp_ranks() {
}
}
}
}
- nb_without_predecessor
s
= 0;
+ nb_without_predecessor = 0;
for(int k = 0; k < _nb_vertices; k++) {
if(nb_predecessors[k] == 0) {
for(int k = 0; k < _nb_vertices; k++) {
if(nb_predecessors[k] == 0) {
- without_predecessor
s[nb_without_predecessors
++] = k;
+ without_predecessor
[nb_without_predecessor
++] = k;
}
}
scalar_t rank = 1;
}
}
scalar_t rank = 1;
- while(nb_without_predecessor
s
> 0) {
- new_nb_without_predecessor
s
= 0;
- for(int l = 0; l < nb_without_predecessor
s
; l++) {
- v = _vertices + without_predecessor
s
[l];
+ while(nb_without_predecessor > 0) {
+ new_nb_without_predecessor = 0;
+ for(int l = 0; l < nb_without_predecessor; l++) {
+ v = _vertices + without_predecessor[l];
v->distance_from_source = rank;
for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
tv = int(e->terminal_vertex - _vertices);
nb_predecessors[tv]--;
ASSERT(nb_predecessors[tv] >= 0);
if(nb_predecessors[tv] == 0) {
v->distance_from_source = rank;
for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
tv = int(e->terminal_vertex - _vertices);
nb_predecessors[tv]--;
ASSERT(nb_predecessors[tv] >= 0);
if(nb_predecessors[tv] == 0) {
- new_without_predecessor
s[new_nb_without_predecessors
++] = tv;
+ new_without_predecessor
[new_nb_without_predecessor
++] = tv;
}
}
}
}
}
}
- swap(without_predecessor
s, new_without_predecessors
);
- nb_without_predecessor
s = new_nb_without_predecessors
;
+ swap(without_predecessor
, new_without_predecessor
);
+ nb_without_predecessor
= new_nb_without_predecessor
;
rank++;
}
rank++;
}
@@
-257,8
+257,8
@@
void MTPGraph::compute_dp_ranks() {
}
delete[] nb_predecessors;
}
delete[] nb_predecessors;
- delete[] without_predecessor
s
;
- delete[] new_without_predecessor
s
;
+ delete[] without_predecessor;
+ delete[] new_without_predecessor;
}
//////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////