projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Seems to work. Lot of debugging garbage still in there.
[mtp.git]
/
mtp_graph.h
diff --git
a/mtp_graph.h
b/mtp_graph.h
index
f28e460
..
5842671
100644
(file)
--- a/
mtp_graph.h
+++ b/
mtp_graph.h
@@
-49,6
+49,13
@@
class MTPGraph {
// the total correction when compiled in VERBOSE mode.
void force_positivized_lengths();
// the total correction when compiled in VERBOSE mode.
void force_positivized_lengths();
+ void decrease_distance_in_heap(Vertex *v);
+ void increase_distance_in_heap(Vertex *v);
+
+ // Visit the vertices according to _dp_order and simply update their
+ // distance to the source
+ void dp_distance_propagation();
+
// Set in every vertex pred_edge_toward_source correspondingly to
// the path of shortest length. The current implementation is not
// Dijkstra's!
// Set in every vertex pred_edge_toward_source correspondingly to
// the path of shortest length. The current implementation is not
// Dijkstra's!
@@
-59,17
+66,24
@@
class MTPGraph {
// nodes met along the path, and computes path->length properly.
int retrieve_one_path(Edge *e, Path *path);
// nodes met along the path, and computes path->length properly.
int retrieve_one_path(Edge *e, Path *path);
- // Returns if the graph is a DAG
+ // Returns if the graph is a DAG, and set the last_change field of
+ // each vertex to the maximum number of iterations required to reach
+ // it
int is_dag();
int is_dag();
- Vertex **_front, **_new_front;
-
int _nb_vertices, _nb_edges;
Vertex *_source, *_sink;
Edge *_edges;
Vertex *_vertices;
int _nb_vertices, _nb_edges;
Vertex *_source, *_sink;
Edge *_edges;
Vertex *_vertices;
+ // For the shortest path search
+
+ Vertex **_heap;
+ int _heap_size;
+
+ Vertex **_dp_order;
+
public:
// These variables are filled when retrieve_disjoint_paths is called
public:
// These variables are filled when retrieve_disjoint_paths is called