projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[mtp.git]
/
mtp_graph.cc
diff --git
a/mtp_graph.cc
b/mtp_graph.cc
index
f94cec7
..
8160211
100644
(file)
--- a/
mtp_graph.cc
+++ b/
mtp_graph.cc
@@
-83,17
+83,6
@@
void Vertex::del_edge(Edge *e) {
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
-Path::Path(int l) {
- length = l;
- nodes = new int[length];
-}
-
-Path::~Path() {
- delete[] nodes;
-}
-
-//////////////////////////////////////////////////////////////////////
-
MTPGraph::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) {
@@
-152,17
+141,19
@@
void MTPGraph::print(ostream *os) {
void MTPGraph::print_dot(ostream *os) {
(*os) << "digraph {" << endl;
void MTPGraph::print_dot(ostream *os) {
(*os) << "digraph {" << endl;
- (*os) << " node[shape=circle];" << endl;
+ // (*os) << " node [shape=circle];" << endl;
+ (*os) << " " << _source->id << " [peripheries=2];" << endl;
+ (*os) << " " << _sink->id << " [peripheries=2];" << endl;
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
// (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
// << ";"
// << endl;
if(e->occupied) {
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
// (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
// << ";"
// << endl;
if(e->occupied) {
- (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+ (*os) << "
" << e->origin_vertex->id << " -> " << e->terminal_vertex->id
<< " [style=bold,color=black,label=\"" << e->length << "\"];" << endl;
} else {
<< " [style=bold,color=black,label=\"" << e->length << "\"];" << endl;
} else {
- (*os) << " " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+ (*os) << "
" << e->origin_vertex->id << " -> " << e->terminal_vertex->id
<< " [color=gray,label=\"" << e->length << "\"];" << endl;
}
}
<< " [color=gray,label=\"" << e->length << "\"];" << endl;
}
}
@@
-262,7
+253,6
@@
void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
tmp_front_size = _new_front_size;
_new_front_size = _front_size;
_front_size = tmp_front_size;
tmp_front_size = _new_front_size;
_new_front_size = _front_size;
_front_size = tmp_front_size;
- cout << "_front_size = " << _front_size << endl;
} while(_front_size > 0);
}
} while(_front_size > 0);
}