X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.cc;h=8490d6f859570b5db77fdca38fdb2875004f2036;hb=ea33e3e5dddbe3796d2361910e1e3ed98a19865c;hp=e0b0903af548d6427a6966fe37f20791a867fbc7;hpb=455e5736828233445ac8aea8f15b3bde7e16e9bf;p=mtp.git

diff --git a/tracker.cc b/tracker.cc
index e0b0903..8490d6f 100644
--- a/tracker.cc
+++ b/tracker.cc
@@ -32,22 +32,32 @@ Tracker::Tracker(int nb_time_steps, int nb_locations) {
       _allowed_motion[l][m] = 0;
     }
   }
+
+  _edge_lengths = 0;
+  _graph = 0;
+  _edge_occupation = 0;
 }
 
 Tracker::~Tracker() {
+  delete[] _edge_lengths;
+  delete _graph;
+  delete[] _edge_occupation;
+  deallocate_array<scalar_t>(_detection_score);
+  deallocate_array<int>(_allowed_motion);
 }
 
-void Tracker::set_allowed_motion(int from_location, int to_location) {
-  _allowed_motion[from_location][to_location] = 1;
+void Tracker::set_allowed_motion(int from_location, int to_location, int v) {
+  _allowed_motion[from_location][to_location] = v;
 }
 
 void Tracker::set_detection_score(int time, int location, scalar_t score) {
   _detection_score[time][location] = score;
 }
 
-void Tracker::track() {
-
-  cerr << "Building graph." << endl;
+void Tracker::build_graph() {
+  delete[] _edge_lengths;
+  delete[] _graph;
+  delete[] _edge_occupation;
 
   int nb_motions = 0;
   for(int l = 0; l < _nb_locations; l++) {
@@ -57,41 +67,51 @@ void Tracker::track() {
   }
 
   int nb_vertices = 2 + 2 * _nb_time_steps * _nb_locations;
-  int nb_edges = _nb_locations * 2    // From source and to sink
-    + (_nb_time_steps - 1) * nb_motions     // Motions
-    + _nb_locations * _nb_time_steps; // Doubling of nodes to force
-                                      // one target per location
+  int nb_edges = _nb_locations * 2
+    + (_nb_time_steps - 1) * nb_motions
+    + _nb_locations * _nb_time_steps;
 
   int source = 0, sink = nb_vertices - 1;
   int *node_from = new int[nb_edges];
   int *node_to = new int[nb_edges];
-  scalar_t *edge_lengths = new scalar_t[nb_edges];
   int e = 0;
 
+  _edge_lengths = new scalar_t[nb_edges];
+  _edge_occupation = new int[nb_edges];
+
+  // We put the in-node edges first, since these are the ones whose
+  // lengths we will have to change according to the detection score
+
+  for(int t = 0; t < _nb_time_steps; t++) {
+    for(int l = 0; l < _nb_locations; l++) {
+      node_from[e] = 1 + (2 * (t + 0) + 0) * _nb_locations + l;
+      node_to[e] =   1 + (2 * (t + 0) + 1) * _nb_locations + l;
+      e++;
+    }
+  }
+
+  // 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;
-    edge_lengths[e] = 0.0;
+    _edge_lengths[e] = 0.0;
     e++;
   }
 
   for(int t = 0; t < _nb_time_steps; t++) {
     for(int l = 0; l < _nb_locations; l++) {
-      node_from[e] = 1 + (2 * (t + 0) + 0) * _nb_locations + l;
-      node_to[e] =   1 + (2 * (t + 0) + 1) * _nb_locations + l;
-      edge_lengths[e] = - _detection_score[t][l];
-      e++;
       if(t == _nb_time_steps - 1) {
         node_from[e] = 1 + (2 * (t + 0) + 1) * _nb_locations + l;
-        node_to[e] =   sink;
-        edge_lengths[e] = 0.0;
+        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] = 1 + (2 * (t + 0) + 1) * _nb_locations + l;
             node_to[e] =   1 + (2 * (t + 1) + 0) * _nb_locations + k;
-            edge_lengths[e] = 0.0;
+            _edge_lengths[e] = 0.0;
             e++;
           }
         }
@@ -99,35 +119,29 @@ void Tracker::track() {
     }
   }
 
-  cerr << "DEBUG e = " << e << " nb_edges = " << nb_edges << endl;
+  _graph = new MTPGraph(nb_vertices, nb_edges,
+                        node_from, node_to,
+                        source, sink);
 
-  _graph = new MTPGraph(nb_vertices, nb_edges, node_from, node_to, source, sink);
-
-  int *edge_occupation = new int[nb_edges];
+  delete[] node_from;
+  delete[] node_to;
+}
 
-  _graph->find_best_paths(edge_lengths, edge_occupation);
+void Tracker::track() {
+  int e = 0;
+  for(int t = 0; t < _nb_time_steps; t++) {
+    for(int l = 0; l < _nb_locations; l++) {
+      _edge_lengths[e] = - _detection_score[t][l];
+      e++;
+    }
+  }
 
-  dot_print(nb_vertices, nb_edges, node_from, node_to, edge_lengths,
-            source, sink,
-            edge_occupation);
+  _graph->find_best_paths(_edge_lengths, _edge_occupation);
 
-  delete[] edge_occupation;
-  delete _graph;
+  _graph->print_dot();
 }
 
 // void Tracker::track() {
-  // int e = _nb_locations;
-  // for(int t = 0; t <= _nb_time_steps; t++) {
-    // for(int l = 0; l < _nb_locations; l++) {
-      // edge_lengths[e] = _detection_score[t][l];
-      // e++;
-      // if(t == _nb_time_steps) {
-        // e++;
-      // } else {
-        // e += _nb_locations;
-      // }
-    // }
-  // }
 // }
 
 // int Tracker::nb_trajectories() {