X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=92e3875ce43f85e5c78466d21db8f6c5d49410aa;hb=1099e1c9f0798c7b648948fa23715b17988e10a0;hp=6867e094f94cb12b955a7e517e08a92dec70ef1e;hpb=24d311902f1367ea7de57ce8f737c12934234577;p=mtp.git
diff --git a/mtp_graph.cc b/mtp_graph.cc
index 6867e09..92e3875 100644
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -1,20 +1,26 @@
-///////////////////////////////////////////////////////////////////////////
-// This program is free software: you can redistribute it and/or modify //
-// it under the terms of the version 3 of the GNU General Public License //
-// as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program. If not, see . //
-// //
-// Written by and Copyright (C) Francois Fleuret //
-// Contact for comments & bug reports //
-///////////////////////////////////////////////////////////////////////////
+/*
+ * mtp is the ``Multi Tracked Paths'', an implementation of the
+ * k-shortest paths algorithm for multi-target tracking.
+ *
+ * Copyright (c) 2012 Idiap Research Institute, http://www.idiap.ch/
+ * Written by Francois Fleuret
+ *
+ * This file is part of mtp.
+ *
+ * mtp is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * mtp is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with selector. If not, see .
+ *
+ */
#include "mtp_graph.h"
@@ -90,7 +96,7 @@ void Vertex::del_leaving_edge(Edge *e) {
//////////////////////////////////////////////////////////////////////
MTPGraph::MTPGraph(int nb_vertices, int nb_edges,
- int *from, int *to,
+ int *vertex_from, int *vertex_to,
int source, int sink) {
_nb_vertices = nb_vertices;
_nb_edges = nb_edges;
@@ -108,11 +114,11 @@ MTPGraph::MTPGraph(int nb_vertices, int nb_edges,
}
for(int e = 0; e < nb_edges; e++) {
- _vertices[from[e]].add_leaving_edge(_edges + e);
+ _vertices[vertex_from[e]].add_leaving_edge(_edges + e);
_edges[e].occupied = 0;
_edges[e].id = e;
- _edges[e].origin_vertex = _vertices + from[e];
- _edges[e].terminal_vertex = _vertices + to[e];
+ _edges[e].origin_vertex = _vertices + vertex_from[e];
+ _edges[e].terminal_vertex = _vertices + vertex_to[e];
}
paths = 0;
@@ -147,7 +153,7 @@ void MTPGraph::print(ostream *os) {
void MTPGraph::print_dot(ostream *os) {
(*os) << "digraph {" << endl;
- (*os) << " node [shape=circle,width=0.7,fixedsize=true];" << endl;
+ (*os) << " node [shape=circle,width=0.75,fixedsize=true];" << endl;
(*os) << " edge [color=gray,arrowhead=open]" << endl;
(*os) << " " << _source->id << " [peripheries=2];" << endl;
(*os) << " " << _sink->id << " [peripheries=2];" << endl;