X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.cc;h=37fbfe2fc0d3a5fba24482b0623d0e18aeb42007;hb=d88b0404a88b446020f9ad749ec9aff971679e4a;hp=3a311cd006246d6f01b3b358bd57a706aa964bb2;hpb=fda29b3422f4850d77e4b8f4916251509789d3ac;p=mtp.git

diff --git a/tracker.cc b/tracker.cc
index 3a311cd..37fbfe2 100644
--- a/tracker.cc
+++ b/tracker.cc
@@ -68,7 +68,6 @@ void Tracker::set_detection_score(int time, int location, scalar_t score) {
 }
 
 void Tracker::build_graph() {
-
   // Delete existing graph
   delete[] _edge_lengths;
   delete _graph;
@@ -86,7 +85,7 @@ void Tracker::build_graph() {
 
   int nb_edges =
     _nb_locations * 2 +
-    _nb_time_steps * (nb_exits + nb_entrances) +
+    (_nb_time_steps - 2) * (nb_exits + nb_entrances) +
     (_nb_time_steps - 1) * nb_motions +
     _nb_locations * _nb_time_steps;
 
@@ -109,7 +108,6 @@ void Tracker::build_graph() {
   }
 
   // We put the other edges after
-
   for(int l = 0; l < _nb_locations; l++) {
     node_from[e] = source;
     node_to[e] = 1 + l + 0 * _nb_locations;
@@ -137,7 +135,7 @@ void Tracker::build_graph() {
     }
   }
 
-  for(int t = 0; t < _nb_time_steps; t++) {
+  for(int t = 1; t < _nb_time_steps-1; t++) {
     for(int l = 0; l < _nb_locations; l++) {
       if(_entrances[l]) {
         node_from[e] = source;
@@ -147,7 +145,7 @@ void Tracker::build_graph() {
       }
       if(_exits[l]) {
         node_from[e] =   1 + (2 * (t + 0) + 1) * _nb_locations + l;
-        node_from[e] = sink;
+        node_to[e] = sink;
         _edge_lengths[e] = 0.0;
         e++;
       }
@@ -176,12 +174,27 @@ void Tracker::track() {
 
   _graph->find_best_paths(_edge_lengths);
   _graph->retrieve_disjoint_paths();
+
+#ifdef VERBOSE
+  for(int p = 0; p < _graph->nb_paths; p++) {
+    Path *path = _graph->paths[p];
+    cout << "PATH " << p << " [length " << path->length << "] " << path->nodes[0];
+    for(int n = 1; n < path->length; n++) {
+      cout << " -> " << path->nodes[n];
+    }
+    cout << endl;
+  }
+#endif
 }
 
 int Tracker::nb_trajectories() {
   return _graph->nb_paths;
 }
 
+int Tracker::trajectory_entrance_time(int k) {
+  return (_graph->paths[k]->nodes[1] - 1) / (2 * _nb_locations);
+}
+
 int Tracker::trajectory_duration(int k) {
   return (_graph->paths[k]->length - 2) / 2;
 }