X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=92e3875ce43f85e5c78466d21db8f6c5d49410aa;hb=de64ce0b1101045816e6731e03d2735356c33ef0;hp=915b5b640a3a9ba0ee768dc3db92b623c24cec0c;hpb=4d9b58034ce82094c233b61da247e11a584ec0bd;p=mtp.git

diff --git a/mtp_graph.cc b/mtp_graph.cc
index 915b5b6..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 <http://www.gnu.org/licenses/>.  //
-//                                                                       //
-// Written by and Copyright (C) Francois Fleuret                         //
-// Contact <francois.fleuret@idiap.ch> 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 <francois.fleuret@idiap.ch>
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #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;