Changed the date.

[mtp.git] / mtp_example.cc

diff --git a/mtp_example.cc b/mtp_example.cc
index 2d6489e..9e8db82 100644 (file)
--- 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);
   }
 }
 
@@ -56,12 +57,12 @@ int main(int argc, char **argv) {
   // any location less than motion_amplitude away, entrance at
   // 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. target can
+  // 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 m = 0; m < nb_locations; m++) {
-      tracker->allowed_motion[l][m] = abs(l - m) <= motion_amplitude;
+      tracker->allowed_motions[l][m] = abs(l - m) <= motion_amplitude;
     }
   }
 
@@ -83,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.
@@ -145,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);
     }