X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=9093a8b465d5b4b094d0c8e2cab425db5e2649b0;hb=bfbef5a16cf4282429c9f913b6122ffc550790bd;hp=ae0003ae8db2153b2a716cc5de638b1f43cbedf9;hpb=6afe91234d7807ce82b96a071087decb2f7aead3;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index ae0003a..9093a8b 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -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/>.
+ *
+ */
 
 #ifndef MTP_GRAPH_H
 #define MTP_GRAPH_H
@@ -34,11 +40,13 @@ class MTPGraph {
   void update_positivized_lengths();
   void force_positivized_lengths();
   // Set the edge pred_edge_toward_source correspondingly to the path
-  // of shortest length.
+  // of shortest length. The current implementation is not Dijkstra's!
   void find_shortest_path();
   // Follows the path starting on edge e and returns its length. If
   // nodes is non-null, stores in it the nodes met along the path.
   int retrieve_one_path(Edge *e, Path *path);
+  // Returns if the graph is a DAG
+  int is_dag();
 
   Vertex **_front, **_new_front;
 
@@ -54,7 +62,7 @@ public:
   int nb_paths;
   Path **paths;
 
-  MTPGraph(int nb_vertices, int nb_edges, int *from, int *to,
+  MTPGraph(int nb_vertices, int nb_edges, int *vertex_from, int *vertex_to,
            int source, int sink);
 
   ~MTPGraph();