projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved the heap-related methods in the Vertex class, made them inline.
[mtp.git]
/
mtp_graph.h
diff --git
a/mtp_graph.h
b/mtp_graph.h
index
f28e460
..
ff15830
100644
(file)
--- a/
mtp_graph.h
+++ b/
mtp_graph.h
@@
-49,9
+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();
+ // Visit the vertices according to _dp_order and simply update their
+ // distance to the source
+ void dp_compute_distances();
+
// Set in every vertex pred_edge_toward_source correspondingly to
// Set in every vertex pred_edge_toward_source correspondingly to
- // the path of shortest length. The current implementation is
not
- // Dijkstra
's!
+ // the path of shortest length. The current implementation is
+ // Dijkstra
with a Binary Heap (and not with Fibonnaci heap (yet))
void find_shortest_path();
// Follows the path starting on edge e and returns the number of
void find_shortest_path();
// Follows the path starting on edge e and returns the number of
@@
-59,10
+63,9
@@
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
- int is_dag();
-
- Vertex **_front, **_new_front;
+ // Set the distance_from_source fields to the number of DP
+ // iterations needed to update it. Abort if the graph is not a DAG.
+ int compute_dp_distances();
int _nb_vertices, _nb_edges;
Vertex *_source, *_sink;
int _nb_vertices, _nb_edges;
Vertex *_source, *_sink;
@@
-70,6
+73,14
@@
class MTPGraph {
Edge *_edges;
Vertex *_vertices;
Edge *_edges;
Vertex *_vertices;
+ // For Dijkstra
+ Vertex **_heap;
+ int _heap_size;
+
+ // Updating the distances from the source in that order will work in
+ // the original graph (which has to be a DAG)
+ 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
@@
-81,11
+92,11
@@
public:
~MTPGraph();
~MTPGraph();
- // Compute the family of path with minimum total length, set the
+ // Compute the family of path
s
with minimum total length, set the
// edge occupied fields accordingly.
void find_best_paths(scalar_t *lengths);
// edge occupied fields accordingly.
void find_best_paths(scalar_t *lengths);
- // Retrieve the path corresponding to the occupied edges, and save
+ // Retrieve the path
s
corresponding to the occupied edges, and save
// the result in the nb_paths and paths fields.
void retrieve_disjoint_paths();
// the result in the nb_paths and paths fields.
void retrieve_disjoint_paths();