//////////////////////////////////////////////////////////////////////
-Path::Path(int l) {
- length = l;
- nodes = new int[length];
-}
-
-Path::~Path() {
- delete[] nodes;
-}
-
-//////////////////////////////////////////////////////////////////////
-
MTPGraph::MTPGraph(int nb_vertices, int nb_edges,
int *from, int *to,
int source, int sink) {
//////////////////////////////////////////////////////////////////////
-void MTPGraph::print() {
+void MTPGraph::print(ostream *os) {
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
- cout << e->origin_vertex->id
+ (*os) << e->origin_vertex->id
<< " -> "
<< e->terminal_vertex->id
<< " "
<< e->length;
if(e->occupied) {
- cout << " *";
+ (*os) << " *";
}
- cout << endl;
+ (*os) << endl;
}
}
-void MTPGraph::print_dot() {
- cout << "digraph {" << endl;
- cout << " node[shape=circle];" << endl;
+void MTPGraph::print_dot(ostream *os) {
+ (*os) << "digraph {" << endl;
+ // (*os) << " node [shape=circle];" << endl;
+ (*os) << " " << _source->id << " [peripheries=2];" << endl;
+ (*os) << " " << _sink->id << " [peripheries=2];" << endl;
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
+ // (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+ // << ";"
+ // << endl;
if(e->occupied) {
- cout << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
- << " [style=bold,color=black,label=\"" << -e->length << "\"];" << endl;
+ (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+ << " [style=bold,color=black,label=\"" << e->length << "\"];" << endl;
} else {
- cout << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+ (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
<< " [color=gray,label=\"" << e->length << "\"];" << endl;
}
}
- cout << "}" << endl;
+ (*os) << "}" << endl;
}
//////////////////////////////////////////////////////////////////////
void MTPGraph::update_positivized_lengths() {
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
- e->positivized_length += e->terminal_vertex->distance_from_source - e->terminal_vertex->distance_from_source;
+ e->positivized_length +=
+ e->origin_vertex->distance_from_source - e->terminal_vertex->distance_from_source;
}
}
void MTPGraph::force_positivized_lengths() {
#ifdef VERBOSE
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) {
#ifdef VERBOSE
residual_error -= e->positivized_length;
+ max_error = max(max_error, fabs(e->positivized_length));
#endif
e->positivized_length = 0.0;
}
}
}
#ifdef VERBOSE
- cerr << "residual_error " << residual_error << endl;
+ cerr << "residual_error " << residual_error << " max_error " << residual_error << endl;
#endif
}
do {
_new_front_size = 0;
iteration++;
+
for(int f = 0; f < _front_size; f++) {
v = _front[f];
for(e = v->leaving_edges; e; e = e->next_leaving_edge) {
for(int e = 0; e < _nb_edges; e++) {
_edges[e].length = lengths[e];
+ _edges[e].occupied = 0;
_edges[e].positivized_length = _edges[e].length;
}
// If that length is negative
if(total_length < 0.0) {
#ifdef VERBOSE
- cout << "Found a path of length " << total_length << endl;
+ cerr << "Found a path of length " << total_length << endl;
#endif
// Invert all the edges along the best path
v = _sink;
}
int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
- Edge *f, *next;
+ Edge *f, *next = 0;
int l = 0;
if(nodes) { nodes[l++] = e->origin_vertex->id; }