#include "mtp_graph.h"
-#include <iostream>
+// #include <iostream>
#include <float.h>
-#include <stdlib.h>
using namespace std;
scalar_t distance_from_source;
Edge *pred_edge_toward_source;
- int iteration; // Used in find_shortest_path to know if we already
- // added this vertex to the front
+ int last_change; // Used to mark which edges have already been
+ // processed in some methods
+
Vertex();
+
inline void add_leaving_edge(Edge *e);
inline void del_leaving_edge(Edge *e);
};
void Edge::invert() {
length = - length;
- positivized_length = 0;
+ positivized_length = - positivized_length;
origin_vertex->del_leaving_edge(this);
terminal_vertex->add_leaving_edge(this);
Vertex *t = terminal_vertex;
scalar_t residual_error = 0.0;
scalar_t max_error = 0.0;
#endif
- for(int n = 0; n < _nb_vertices; n++) {
- for(Edge *e = _vertices[n].leaving_edges; e; e = e->next_leaving_edge) {
- if(e->positivized_length < 0) {
+ for(int k = 0; k < _nb_edges; k++) {
+ Edge *e = _edges + k;
+
+ if(e->positivized_length < 0) {
+
#ifdef VERBOSE
+ if((e->origin_vertex->last_change < 0 && e->terminal_vertex->last_change >= 0) ||
+ (e->origin_vertex->last_change >= 0 && e->terminal_vertex->last_change < 0)) {
+ cout << "Inconsistent non-connexity (this should never happen)." << endl;
+ abort();
+ }
+ if(e->origin_vertex->last_change >= 0 &&
+ e->terminal_vertex->last_change >= 0 &&
+ e->positivized_length < 0) {
residual_error -= e->positivized_length;
max_error = max(max_error, - e->positivized_length);
-#endif
- e->positivized_length = 0.0;
}
+#endif
+ e->positivized_length = 0.0;
}
}
#ifdef VERBOSE
}
int MTPGraph::is_dag() {
- Vertex *v, *tv;
+ Vertex *v;
Edge *e;
// We put everybody in the front
for(int k = 0; k < _nb_vertices; k++) {
- _vertices[k].iteration = 0;
+ _vertices[k].last_change = -1;
_front[k] = &_vertices[k];
}
- int front_size = _nb_vertices, nb_with_incoming;
int iteration = 0;
- int new_front_size, pred_front_size;
+ int front_size = _nb_vertices, pred_front_size;
do {
- iteration++;
- nb_with_incoming = 0;
-
// We set the iteration field of all vertex with incoming edges to
// the current iteration value
for(int f = 0; f < front_size; f++) {
v = _front[f];
for(e = v->leaving_edges; e; e = e->next_leaving_edge) {
- tv = e->terminal_vertex;
- tv->iteration = iteration;
+ e->terminal_vertex->last_change = iteration;
}
}
- new_front_size = 0;
+ pred_front_size = front_size;
+ front_size = 0;
+
// We remove all the vertices without incoming edge
- for(int f = 0; f < front_size; f++) {
+ for(int f = 0; f < pred_front_size; f++) {
v = _front[f];
- if(v->iteration == iteration) {
- _front[new_front_size++] = v;
+ if(v->last_change == iteration) {
+ _front[front_size++] = v;
}
}
- pred_front_size = front_size;
- front_size = new_front_size;
+ iteration++;
} while(front_size < pred_front_size);
return front_size == 0;
void MTPGraph::find_shortest_path() {
Vertex **tmp_front;
- int tmp_front_size;
Vertex *v, *tv;
Edge *e;
scalar_t d;
+#ifdef DEBUG
+ if(is_dag()) {
+ cout << "find_shortest_path: DAG -> ok" << endl;
+ } else {
+ for(int e = 0; e < _nb_edges; e++) {
+ if(_edges[e].positivized_length < 0) abort();
+ }
+ cout << "find_shortest_path: All positivized_length are positive -> ok" << endl;
+ }
+#endif
+
for(int k = 0; k < _nb_vertices; k++) {
_vertices[k].distance_from_source = FLT_MAX;
_vertices[k].pred_edge_toward_source = 0;
- _vertices[k].iteration = 0;
+ _vertices[k].last_change = -1;
}
int iteration = 0;
do {
new_front_size = 0;
- iteration++;
for(int f = 0; f < front_size; f++) {
v = _front[f];
if(d < tv->distance_from_source) {
tv->distance_from_source = d;
tv->pred_edge_toward_source = e;
- if(tv->iteration < iteration) {
+ if(tv->last_change < iteration) {
_new_front[new_front_size++] = tv;
- tv->iteration = iteration;
+ tv->last_change = iteration;
}
}
}
}
- tmp_front = _new_front;
- _new_front = _front;
- _front = tmp_front;
+ tmp_front = _new_front; _new_front = _front; _front = tmp_front;
- tmp_front_size = new_front_size;
- new_front_size = front_size;
- front_size = tmp_front_size;
+ front_size = new_front_size;
+
+ iteration++;
} while(front_size > 0);
}
_edges[e].positivized_length = _edges[e].length;
}
- // Let's be a bit paranoid
- ASSERT(is_dag());
-
// We call find_shortest_path here to set properly the distances to
// the source, so that we can make all the edge lengths positive at
// the first iteration.
// Do we reach the sink?
if(_sink->pred_edge_toward_source) {
- // If yes, compute the length of the best path
+ // If yes, compute the length of the best path according to the
+ // original edge lengths
v = _sink;
while(v->pred_edge_toward_source) {
total_length += v->pred_edge_toward_source->length;