X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_graph.h;h=64308b9c000d6e45de0372080fb504ea39880436;hp=e0f40e94abff51b5721e384d5603f7b18dd1ebb6;hb=HEAD;hpb=1bafc06664224a632f4f607a23a8187f32a1f447 diff --git a/mtp_graph.h b/mtp_graph.h index e0f40e9..64308b9 100644 --- a/mtp_graph.h +++ b/mtp_graph.h @@ -61,7 +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. - int retrieve_one_path(Edge *e, Path *path); + int retrieve_one_path(Edge *e, Path *path, int *used_edges); int _nb_vertices, _nb_edges; Vertex *_source, *_sink; @@ -71,7 +71,6 @@ class MTPGraph { // 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) @@ -95,7 +94,10 @@ public: 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);