projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated the header.
[mtp.git]
/
mtp.cc
diff --git
a/mtp.cc
b/mtp.cc
index
b400650
..
88e6557
100644
(file)
--- a/
mtp.cc
+++ b/
mtp.cc
@@
-22,7
+22,7
@@
// EXAMPLE: ./mtp ./graph2.txt | dot -T pdf -o- | xpdf -
// EXAMPLE: ./mtp ./graph2.txt | dot -T pdf -o- | xpdf -
-
//
#define VERBOSE
+#define VERBOSE
#include <iostream>
#include <fstream>
#include <iostream>
#include <fstream>
@@
-167,16
+167,25
@@
void Graph::find_shortest_path(Vertex **front, Vertex **new_front) {
Vertex *v, *tv;
scalar_t d;
Vertex *v, *tv;
scalar_t d;
+#ifdef VERBOSE
+ cout << "find_shortest_path" << endl;
+#endif
+
#ifdef DEBUG
#ifdef DEBUG
+ scalar_t residual_error = 0.0;
+#endif
for(int n = 0; n < nb_vertices; n++) {
for(Edge *e = vertices[n].root_edge; e; e = e->next) {
if(e->work_length < 0) {
for(int n = 0; n < nb_vertices; n++) {
for(Edge *e = vertices[n].root_edge; e; e = e->next) {
if(e->work_length < 0) {
- cerr << "DEBUG error in find_shortest_path: Edge work lengths have to be positive."
- << endl;
- abort();
+#ifdef DEBUG
+ residual_error -= e->work_length;
+#endif
+ e->work_length = 0.0;
}
}
}
}
}
}
+#ifdef DEBUG
+ cout << "DEBUG residual_error " << residual_error << endl;
#endif
for(int v = 0; v < nb_vertices; v++) {
#endif
for(int v = 0; v < nb_vertices; v++) {
@@
-327,10
+336,10
@@
int main(int argc, char **argv) {
source, sink,
result_edge_occupation);
source, sink,
result_edge_occupation);
- dot_print(nb_vertices, nb_edges,
- vertex_from, vertex_to, edge_lengths,
- source, sink,
- result_edge_occupation);
+
//
dot_print(nb_vertices, nb_edges,
+
//
vertex_from, vertex_to, edge_lengths,
+
//
source, sink,
+
//
result_edge_occupation);
delete[] result_edge_occupation;
delete[] edge_lengths;
delete[] result_edge_occupation;
delete[] edge_lengths;