X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_example.cc;h=9e8db82b0ac1040267f2e60c1886c3e50b6e8654;hp=92d406285edd10bc151ba8eea832feda102a6a37;hb=f691873b3bfb2c9eff7e249f8a360dd1e636fe70;hpb=c7d5cdf1982dacc5451f79599041b2e95524d3f7

diff --git a/mtp_example.cc b/mtp_example.cc
index 92d4062..9e8db82 100644
--- a/mtp_example.cc
+++ b/mtp_example.cc
@@ -24,6 +24,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <stdlib.h>
 
 using namespace std;
 
@@ -34,9 +35,9 @@ using namespace std;
 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);
   }
 }
 
@@ -54,18 +55,27 @@ int main(int argc, char **argv) {
 
   // 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;
     }
-    tracker->entrances[0] = 1;
-    tracker->exits[nb_locations - 1] = 1;
   }
 
-  tracker->force_empty_first_frame = 0;
-  tracker->force_empty_last_frame = 0;
+  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);
+    }
+  }
 
   // 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.
@@ -136,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);
     }