X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=92e3875ce43f85e5c78466d21db8f6c5d49410aa;hb=50f548312764a481b3ee3b9153b0b738e2ecca17;hp=1f0f6d30f7f7d47e19e84a06af5b23b304bf01e8;hpb=68d9c4f175f774d851a32f6069ad04b31924bfac;p=mtp.git diff --git a/mtp_graph.cc b/mtp_graph.cc index 1f0f6d3..92e3875 100644 --- a/mtp_graph.cc +++ b/mtp_graph.cc @@ -1,7 +1,7 @@ /* - * mtp is the ``Multi Tracked Path'', an implementation of the - * k-shortest path algorithm for multi-target tracking. + * 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 @@ -96,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; @@ -114,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;