From: Francois Fleuret <francois@fleuret.org>
Date: Sat, 25 Aug 2012 17:16:44 +0000 (+0200)
Subject: Cosmetics.
X-Git-Url: https://ant.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=1099e1c9f0798c7b648948fa23715b17988e10a0;p=mtp.git

Cosmetics.
---

diff --git a/mtp_example.cc b/mtp_example.cc
index d603b3a..0627b81 100644
--- a/mtp_example.cc
+++ b/mtp_example.cc
@@ -33,11 +33,12 @@ using namespace std;
 
 //////////////////////////////////////////////////////////////////////
 
-scalar_t detection_score(scalar_t a, scalar_t b, scalar_t score_noise, scalar_t flip_noise) {
-  if(drand48() > flip_noise) {
-    return a + score_noise * (2.0 * drand48() - 1.0);
+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);
   } else {
-    return b + score_noise * (2.0 * drand48() - 1.0);
+    return true_score + score_noise * (2.0 * drand48() - 1.0);
   }
 }
 
@@ -81,7 +82,7 @@ int main(int argc, char **argv) {
 
   for(int t = 0; t < nb_time_steps; t++) {
     for(int l = 0; l < nb_locations; l++) {
-      tracker->detection_scores[t][l] = detection_score(-1.0, 1.0, score_noise, flip_noise);
+      tracker->noisy_scores[t][l] = noisy_score(-1.0, 1.0, score_noise, flip_noise);
     }
   }
 
@@ -101,20 +102,20 @@ int main(int argc, char **argv) {
     if(t < nb_time_steps/2) {
       la = t;
       lb = nb_locations - 1 - t;
-      sa = detection_score(10.0, -1.0, score_noise, flip_noise);
-      sb = detection_score( 1.0, -1.0, score_noise, flip_noise);
+      sa = noisy_score(10.0, -1.0, score_noise, flip_noise);
+      sb = noisy_score( 1.0, -1.0, score_noise, flip_noise);
     } else {
       la = nb_time_steps - 1 - t;
       lb = t - nb_time_steps + nb_locations;
-      sa = detection_score( 1.0, -1.0, score_noise, flip_noise);
-      sb = detection_score(10.0, -1.0, score_noise, flip_noise);
+      sa = noisy_score( 1.0, -1.0, score_noise, flip_noise);
+      sb = noisy_score(10.0, -1.0, score_noise, flip_noise);
     }
 
     if(la > nb_locations/2 - 1) la = nb_locations/2 - 1;
     if(lb < nb_locations/2 + 1) lb = nb_locations/2 + 1;
 
-    tracker->detection_scores[t][la] = sa;
-    tracker->detection_scores[t][lb] = sb;
+    tracker->noisy_scores[t][la] = sa;
+    tracker->noisy_scores[t][lb] = sb;
   }
 
   { // Write down the tracker setting