projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved the writing of the tracker.dat to main().
[mtp.git]
/
mtp_graph.h
diff --git
a/mtp_graph.h
b/mtp_graph.h
index
bad0df5
..
64308b9
100644
(file)
--- a/
mtp_graph.h
+++ b/
mtp_graph.h
@@
-26,7
+26,6
@@
#define MTP_GRAPH_H
#include <iostream>
#define MTP_GRAPH_H
#include <iostream>
-#include <cmath>
using namespace std;
using namespace std;
@@
-37,6
+36,7
@@
class Vertex;
class Edge;
class MTPGraph {
class Edge;
class MTPGraph {
+
// Uses the estimated vertex distances to the source to make all the
// edge lengths positive, resulting in an identical added value to
// all the paths from the same initial node to the same final node
// Uses the estimated vertex distances to the source to make all the
// edge lengths positive, resulting in an identical added value to
// all the paths from the same initial node to the same final node
@@
-49,12
+49,9
@@
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();
+ // Visit the vertices according to _dp_order and update their
+ // distance from the source
+ void dp_compute_distances();
// Set in every vertex pred_edge_toward_source correspondingly to
// the path of shortest length. The current implementation is
// Set in every vertex pred_edge_toward_source correspondingly to
// the path of shortest length. The current implementation is
@@
-64,12
+61,7
@@
class MTPGraph {
// Follows the path starting on edge e and returns the number of
// nodes to reach the sink. If path is non-null, stores in it the
// nodes met along the path, and computes path->length properly.
// Follows the path starting on edge e and returns the number of
// nodes to reach the sink. If path is non-null, stores in it the
// 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, and set the last_change field of
- // each vertex to the maximum number of iterations required to reach
- // it
- int check_DAG_and_set_last_change();
+ int retrieve_one_path(Edge *e, Path *path, int *used_edges);
int _nb_vertices, _nb_edges;
Vertex *_source, *_sink;
int _nb_vertices, _nb_edges;
Vertex *_source, *_sink;
@@
-79,12
+71,13
@@
class MTPGraph {
// For Dijkstra
Vertex **_heap;
// 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;
// Updating the distances from the source in that order will work in
// the original graph (which has to be a DAG)
Vertex **_dp_order;
+ // Fills _dp_order
+ void compute_dp_ordering();
public:
// These variables are filled when retrieve_disjoint_paths is called
public:
// These variables are filled when retrieve_disjoint_paths is called
@@
-101,7
+94,10
@@
public:
void find_best_paths(scalar_t *lengths);
// Retrieve the paths corresponding to the occupied edges, and save
void find_best_paths(scalar_t *lengths);
// Retrieve the paths corresponding to the occupied edges, and save
- // the result in the nb_paths and paths fields.
+ // the result in the nb_paths and paths fields. If the paths are not
+ // node-disjoint, there are multiple families of paths that
+ // "explain" the edge occupancies, and this method picks one of them
+ // arbitrarily.
void retrieve_disjoint_paths();
void print(ostream *os);
void retrieve_disjoint_paths();
void print(ostream *os);