X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=tracker.cc;h=d19093b1860a2bb038ff69492f25196fc20eab8b;hp=4d12e6145d38bd702bbabc8a2c805c305f1880ee;hb=ddbc8b15ea4ff788e10cffd2d3977b65462dd1a7;hpb=9665f6b8d842f02facda1590200742482d4362fa

diff --git a/tracker.cc b/tracker.cc
index 4d12e61..d19093b 100644
--- a/tracker.cc
+++ b/tracker.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 "tracker.h"
 
@@ -190,7 +196,7 @@ void Tracker::build_graph() {
     // The edges from the source to the first frame, and from the last
     // frame to the sink
     _nb_locations * 2 +
-    // The edges from the source to the entrances and from the exists
+    // The edges from the source to the entrances and from the exits
     // to the sink (in every time frames but the first for the
     // entrances, and last for the exits)
     (_nb_time_steps - 1) * (nb_exits + nb_entrances) +
@@ -219,6 +225,8 @@ void Tracker::build_graph() {
     }
   }
 
+  // The edges from the source to the first time frame
+
   for(int l = 0; l < _nb_locations; l++) {
     node_from[e] = source;
     node_to[e] = 1 + l + 0 * _nb_locations;
@@ -226,26 +234,33 @@ void Tracker::build_graph() {
     e++;
   }
 
-  for(int t = 0; t < _nb_time_steps; t++) {
+  // The edges from the last frame to the sink
+
+  for(int l = 0; l < _nb_locations; l++) {
+    node_from[e] = late_pair_node(_nb_time_steps - 1, l);
+    node_to[e] = sink;
+    _edge_lengths[e] = 0.0;
+    e++;
+  }
+
+  // The edges between frames, corresponding to allowed motions
+
+  for(int t = 0; t < _nb_time_steps - 1; t++) {
     for(int l = 0; l < _nb_locations; l++) {
-      if(t == _nb_time_steps - 1) {
-        node_from[e] = late_pair_node(t, l);
-        node_to[e] = sink;
-        _edge_lengths[e] = 0.0;
-        e++;
-      } else {
-        for(int k = 0; k < _nb_locations; k++) {
-          if(allowed_motion[l][k]) {
-            node_from[e] = late_pair_node(t, l);
-            node_to[e] = early_pair_node(t+1, k);
-            _edge_lengths[e] = 0.0;
-            e++;
-          }
+      for(int k = 0; k < _nb_locations; k++) {
+        if(allowed_motion[l][k]) {
+          node_from[e] = late_pair_node(t, l);
+          node_to[e] = early_pair_node(t+1, k);
+          _edge_lengths[e] = 0.0;
+          e++;
         }
       }
     }
   }
 
+  // The edges from the source to the entrances, and from the exits to
+  // the sink
+
   for(int t = 0; t < _nb_time_steps; t++) {
     for(int l = 0; l < _nb_locations; l++) {
       if(t > 0 && entrances[l]) {
@@ -263,6 +278,8 @@ void Tracker::build_graph() {
     }
   }
 
+  // We are done, build the graph
+
   _graph = new MTPGraph(nb_vertices, nb_edges,
                         node_from, node_to,
                         source, sink);