X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_example.cc;h=9e8db82b0ac1040267f2e60c1886c3e50b6e8654;hp=5f9eef247431184e9850b6a81612192506340270;hb=22e800d663bb7a6b03ba6735fef54bf12c6cd2b5;hpb=ddbc8b15ea4ff788e10cffd2d3977b65462dd1a7

diff --git a/mtp_example.cc b/mtp_example.cc
index 5f9eef2..9e8db82 100644
--- a/mtp_example.cc
+++ b/mtp_example.cc
@@ -22,23 +22,22 @@
  *
  */
 
-// Multi-Tracked Path
-
 #include <iostream>
 #include <fstream>
+#include <stdlib.h>
 
 using namespace std;
 
-#include "tracker.h"
+#include "mtp_tracker.h"
 
 //////////////////////////////////////////////////////////////////////
 
 scalar_t noisy_score(scalar_t true_score, scalar_t erroneous_score,
                      scalar_t score_noise, scalar_t flip_noise) {
   if(drand48() < flip_noise) {
-    return erroneous_score + score_noise * (2.0 * drand48() - 1.0);
+    return erroneous_score + score_noise * (2.0f * scalar_t(drand48()) - 1.0f);
   } else {
-    return true_score + score_noise * (2.0 * drand48() - 1.0);
+    return true_score + score_noise * (2.0f * scalar_t(drand48()) - 1.0f);
   }
 }
 
@@ -47,24 +46,35 @@ int main(int argc, char **argv) {
   int nb_time_steps = 8;
   int motion_amplitude = 1;
 
-  Tracker *tracker = new Tracker();
+  MTPTracker *tracker = new MTPTracker();
 
   tracker->allocate(nb_time_steps, nb_locations);
 
-  // We define the spatial structures by stating what are the possible
-  // motions of targets, and what are the entrances and the
-  // exits.
+  // We define the spatial structure by stating what are the possible
+  // motions of targets, and what are the entrances and the exits.
 
   // Here our example is a 1D space with motions from any location to
   // any location less than motion_amplitude away, entrance at
-  // location 0 and exit at location nb_locations-1.
+  // location 0 (or in the first time frame, i.e. targets can already
+  // be in the scene when the sequence starts) and exit at location
+  // nb_locations-1 (or from the last time frame, i.e. targets can
+  // still be present when the sequence finishes)
 
   for(int l = 0; l < nb_locations; l++) {
-    for(int k = 0; k < nb_locations; k++) {
-      tracker->allowed_motion[l][k] = abs(l - k) <= motion_amplitude;
+    for(int m = 0; m < nb_locations; m++) {
+      tracker->allowed_motions[l][m] = abs(l - m) <= motion_amplitude;
+    }
+  }
+
+  for(int t = 0; t < nb_time_steps; t++) {
+    for(int l = 0; l < nb_locations; l++) {
+      // We allow targets to enter in the first time frame, or in
+      // location 0
+      tracker->entrances[t][l] = (t == 0 || l == 0);
+      // We allow targets to leave from the last time frame, or from
+      // location nb_locations-1
+      tracker->exits[t][l] = (t == nb_time_steps - 1 || l == nb_locations-1);
     }
-    tracker->entrances[0] = 1;
-    tracker->exits[nb_locations - 1] = 1;
   }
 
   // We construct the graph corresponding to this structure
@@ -74,8 +84,8 @@ int main(int argc, char **argv) {
   // Then, we specify for every location and time step what is the
   // detection score there.
 
-  scalar_t flip_noise = 0.05;
-  scalar_t score_noise = 0.0;
+  scalar_t flip_noise = 0.05f;
+  scalar_t score_noise = 0.0f;
 
   // We first put a background noise, with negative scores at every
   // location.
@@ -86,14 +96,14 @@ int main(int argc, char **argv) {
     }
   }
 
-  // Then we two targets with the typical local minimum:
+  // Then we add two targets with a typical tracking local minimum
   //
   // * Target A moves from location 0 to the middle, stays there for a
-  //   while, and comes back, and is strongly detected on the first
+  //   while, and comes back. It is strongly detected on the first
   //   half
   //
   // * Target B moves from location nb_locations-1 to the middle, stay
-  //   there for a while, and comes back, and is strongly detected on
+  //   there for a while, and comes back. It is strongly detected on
   //   the second half
 
   int la, lb; // Target locations
@@ -118,12 +128,13 @@ int main(int argc, char **argv) {
     tracker->detection_scores[t][lb] = sb;
   }
 
-  { // Write down the tracker setting
+  { // Write down the tracker setting, so that we can use it as an
+    // example for the mtp command line
     ofstream out_tracker("tracker.dat");
     tracker->write(&out_tracker);
   }
 
-  // Does the tracking per se
+  // Performs the tracking per se
 
   tracker->track();
 
@@ -135,7 +146,7 @@ int main(int argc, char **argv) {
          << " starting at " << tracker->trajectory_entrance_time(t)
          << ", duration " << tracker->trajectory_duration(t)
          << ", score " << tracker->trajectory_score(t)
-         << ", through nodes ";
+         << ", through locations";
     for(int u = 0; u < tracker->trajectory_duration(t); u++) {
       cout << " " << tracker->trajectory_location(t, u);
     }