Cosmetics.

diff --git a/mtp.cc b/mtp.cc
index 105365d..59e950a 100644 (file)
--- a/mtp.cc
+++ b/mtp.cc
@@ -32,10 +32,18 @@ using namespace std;
 
 //////////////////////////////////////////////////////////////////////
 
+scalar_t detection_score(int true_label) {
+  if((true_label > 0) == (drand48() < 0.9)) {
+    return   1.0 + 0.2 * (drand48() - 0.5);
+  } else {
+    return - 1.0 + 0.2 * (drand48() - 0.5);
+  }
+}
+
 int main(int argc, char **argv) {
   int nb_locations = 5;
   int nb_time_steps = 20;
-  int motion_amplitude = 2;
+  int motion_amplitude = 1;
 
   Tracker *tracker = new Tracker(nb_time_steps, nb_locations);
 
@@ -52,19 +60,22 @@ int main(int argc, char **argv) {
   for(int r = 0; r < 10; r++) {
     cout << "* ROUND " << r << endl;
 
+    // We generate synthetic detection scores, all in the center
+    // location, with 10% false detection (FP or FN)
+
     for(int t = 0; t < nb_time_steps; t++) {
       for(int l = 0; l < nb_locations; l++) {
-        tracker->set_detection_score(t, l,
-                                    (drand48() < 0.95 ? -1.0 : 1.0) + drand48() * 0.1 - 0.05);
+        tracker->set_detection_score(t, l, detection_score(-1));
       }
-      tracker->set_detection_score(t, nb_locations/2,
-                                  (drand48() < 0.95 ? 1.0 : -1.0) + drand48() * 0.1 - 0.05);
+      tracker->set_detection_score(t, nb_locations/2, detection_score(1));
     }
 
     tracker->track();
 
     for(int t = 0; t < tracker->nb_trajectories(); t++) {
-      cout << "TRAJECTORY " << t << " :";
+      cout << "TRAJECTORY "
+           << t
+           << " [starting " << tracker->trajectory_entrance_time(t) << "]";
       for(int u = 0; u < tracker->trajectory_duration(t); u++) {
         cout << " " << tracker->trajectory_location(t, u);
       }

diff --git a/mtp_graph.cc b/mtp_graph.cc
index cc816c9..590bdb2 100644 (file)
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -289,7 +289,7 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
     _front_size = tmp_front_size;
   } while(_front_size > 0);
 
-#ifdef DEBUG
+#ifdef VERBOSE
   scalar_t min_delta = 0, delta;
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
@@ -314,9 +314,6 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
     _edges[e].positivized_length = _edges[e].length;
   }
 
-  cout << "********************************************************" << endl;
-  // print_dot(&cout);
-
   // We use one iteration of find_shortest_path simply to propagate
   // the distance to make all the edge lengths positive.
   find_shortest_path(_front, _new_front);

diff --git a/tracker.cc b/tracker.cc
index ad68c28..37fbfe2 100644 (file)
--- a/tracker.cc
+++ b/tracker.cc
@@ -191,6 +191,10 @@ 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;
 }

diff --git a/tracker.h b/tracker.h
index 2ca731a..88f4bf2 100644 (file)
--- a/tracker.h
+++ b/tracker.h
@@ -51,6 +51,7 @@ public:
   void track();
 
   int nb_trajectories();
+  int trajectory_entrance_time(int k);
   int trajectory_duration(int k);
   int trajectory_location(int k, int time);
 };