Cosmetics.

diff --git a/mtp.cc b/mtp.cc
index 06247e6..b80f63b 100644 (file)
--- a/mtp.cc
+++ b/mtp.cc
@@ -51,11 +51,11 @@ int main(int argc, char **argv) {
   int nb_locations = 6;
   int nb_time_steps = 10;
 
-  Tracker tracker(nb_time_steps, nb_locations);
+  Tracker *tracker = new Tracker(nb_time_steps, nb_locations);
 
   for(int l = 0; l < nb_locations; l++) {
     for(int k = 0; k < nb_locations; k++) {
-      tracker.set_allowed_motion(l, k, abs(l - k) <= 1);
+      tracker->set_allowed_motion(l, k, abs(l - k) <= 1);
     }
   }
 
@@ -63,24 +63,26 @@ int main(int argc, char **argv) {
     cout << "* ROUND " << r << endl;
     for(int t = 0; t < nb_time_steps; t++) {
       for(int l = 0; l < nb_locations; l++) {
-        tracker.set_detection_score(t, l,
+        tracker->set_detection_score(t, l,
                                     (drand48() < 0.9 ? -1.0 : 1.0) + drand48() * 0.1 - 0.05);
       }
-      tracker.set_detection_score(t, 0,
+      tracker->set_detection_score(t, 0,
                                   (drand48() < 0.9 ? 1.0 : -1.0) + drand48() * 0.1 - 0.05);
     }
 
-    tracker.build_graph();
-    tracker.track();
+    tracker->build_graph();
+    tracker->track();
 
-    for(int t = 0; t < tracker.nb_trajectories(); t++) {
+    for(int t = 0; t < tracker->nb_trajectories(); t++) {
       cout << "TRAJECTORY " << t << " :";
-      for(int u = 0; u < tracker.trajectory_duration(t); u++) {
-        cout << " " << tracker.trajectory_location(t, u);
+      for(int u = 0; u < tracker->trajectory_duration(t); u++) {
+        cout << " " << tracker->trajectory_location(t, u);
       }
       cout << endl;
     }
   }
 
+  delete tracker;
+
   exit(EXIT_SUCCESS);
 }

diff --git a/tracker.cc b/tracker.cc
index c90ed44..b67ddfb 100644 (file)
--- a/tracker.cc
+++ b/tracker.cc
@@ -137,14 +137,14 @@ void Tracker::track() {
   _graph->find_best_paths(_edge_lengths);
   _graph->retrieve_disjoint_paths();
 
-  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;
-  }
+  // 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;
+  // }
   // _graph->print_dot();
 }