projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics.
[mtp.git]
/
mtp_graph.h
diff --git
a/mtp_graph.h
b/mtp_graph.h
index
072eeec
..
7ccbfe3
100644
(file)
--- a/
mtp_graph.h
+++ b/
mtp_graph.h
@@
-19,28
+19,48
@@
#ifndef MTP_GRAPH_H
#define MTP_GRAPH_H
#ifndef MTP_GRAPH_H
#define MTP_GRAPH_H
+#include <iostream>
+#include <cmath>
+
+using namespace std;
+
#include "misc.h"
#include "misc.h"
+#include "path.h"
class Vertex;
class Edge;
class MTPGraph {
class Vertex;
class Edge;
class MTPGraph {
- void initialize_work_lengths();
- void update_work_length();
+ void initialize_positivized_lengths_with_min();
+ void update_positivized_lengths();
+ void force_positivized_lengths();
void find_shortest_path(Vertex **front, Vertex **new_front);
void find_shortest_path(Vertex **front, Vertex **new_front);
+ int retrieve_one_path(Edge *e, int *nodes);
+
+ Vertex **_front, **_new_front;
int _nb_vertices, _nb_edges;
int _nb_vertices, _nb_edges;
- Edge *edge_heap;
- Vertex *vertices;
- Vertex *source, *sink;
+ Vertex *_source, *_sink;
+
+ Edge *_edges;
+ Vertex *_vertices;
+
public:
public:
+
+ // These variables are filled when retrieve_disjoint_paths is called
+ int nb_paths;
+ Path **paths;
+
MTPGraph(int nb_vertices, int nb_edges, int *from, int *to,
int source, int sink);
~MTPGraph();
MTPGraph(int nb_vertices, int nb_edges, int *from, int *to,
int source, int sink);
~MTPGraph();
- void find_best_paths(scalar_t *lengths, int *result_edge_occupation);
- void print();
+ void find_best_paths(scalar_t *lengths);
+ void retrieve_disjoint_paths();
+
+ void print(ostream *os);
+ void print_dot(ostream *os);
};
#endif
};
#endif