X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_graph.h;h=916b60447083163f860a385129c976a7b0375bae;hp=9c14ea2770f47900252a31c2104749c61323d05a;hb=ddbc8b15ea4ff788e10cffd2d3977b65462dd1a7;hpb=455e5736828233445ac8aea8f15b3bde7e16e9bf

diff --git a/mtp_graph.h b/mtp_graph.h
index 9c14ea2..916b604 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -1,51 +1,75 @@
 
-///////////////////////////////////////////////////////////////////////////
-// 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
 
+#include <iostream>
+#include <cmath>
+
+using namespace std;
+
 #include "misc.h"
+#include "path.h"
 
 class Vertex;
 class Edge;
 
 class MTPGraph {
-  void initialize_work_lengths();
-  void update_work_length();
-  void find_shortest_path(Vertex **front, Vertex **new_front);
+  void update_positivized_lengths();
+  void force_positivized_lengths();
+  // Set the edge pred_edge_toward_source correspondingly to the path
+  // of shortest length.
+  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);
+
+  Vertex **_front, **_new_front;
 
   int _nb_vertices, _nb_edges;
-  Edge *edge_heap;
-  Vertex *vertices;
-  Vertex *source, *sink;
+  Vertex *_source, *_sink;
+
+  Edge *_edges;
+  Vertex *_vertices;
+
 public:
-  MTPGraph(int nb_vertices, int nb_edges, int *from, int *to,
+
+  // These variables are filled when retrieve_disjoint_paths is called
+  int nb_paths;
+  Path **paths;
+
+  MTPGraph(int nb_vertices, int nb_edges, int *vertex_from, int *vertex_to,
            int source, int sink);
 
   ~MTPGraph();
 
-  void find_best_paths(scalar_t *lengths, int *result_edge_occupation);
-  void print();
-};
+  void find_best_paths(scalar_t *lengths);
+  void retrieve_disjoint_paths();
 
-void dot_print(int nb_vertices,
-               int nb_edges, int *ea, int *eb, scalar_t *el,
-               int source, int sink,
-               int *edge_occupation);
+  void print(ostream *os);
+  void print_dot(ostream *os);
+};
 
 #endif