found a bug in check_epi.c in test_find_candidates

OpenPTV · May 6, 2023 · 97e1ac8 · 97e1ac8 · alexlib · May 6, 2023
1 parent 0ab6dbd
commit 97e1ac8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/liboptv/src/epi.c b/liboptv/src/epi.c
@@ -201,6 +201,11 @@ int find_candidate (coord_2d *crd, target *pix, int num,
           continue;
 
       p2 = crd[j].pnr;
+
+      if (p2 >= num) {
+          printf("pnr out of range: %d\n", p2);
+          return -1;
+      }
 
       /* quality of each parameter is a ratio of the values of the 
          size n, nx, ny and sum of grey values sumg */

diff --git a/liboptv/tests/check_epi.c b/liboptv/tests/check_epi.c
@@ -203,20 +203,20 @@ START_TEST(test_find_candidate)
         {3, 0.2, 0.8, 10, 3, 3, 30, -999},
         {4, 0.4, -1.1, 10, 3, 3, 40, -999},
         {1, 0.7, -0.1, 10, 3, 3, 50, -999},
-        {7, 1.2, 0.3, 10, 3, 3, 60, -999},
+        {2, 1.2, 0.3, 10, 3, 3, 60, -999},
         {5, 10.4, 0.1, 10, 3, 3, 70, -999}
     };
 
     int num_pix = 7; /* length of the test_pix */
 
     /* coord_2d is int pnr, double x,y */
     coord_2d test_crd[] = {
-        {0, 0.0, 0.0},
         {6, 0.1, 0.1}, /* best candidate, right on the diagonal */
         {3, 0.2, 0.8},
         {4, 0.4, -1.1},
         {1, 0.7, -0.1},
-        {7, 1.2, 0.3},
+        {2, 1.2, 0.3},
+        {0, 0.0, 0.0},
         {5, 10.4, 0.1}
     };
 
@@ -290,9 +290,13 @@ START_TEST(test_find_candidate)
         n, nx, ny, sumg, test_cand, &test_vpar, test_cpar, &test_cal);
 
     free_control_par(test_cpar);
+
+    for (i=0; i<count; i++) {
+        printf("candidate %d: pnr %d, corr %f, tol %f\n", i, test_cand[i].pnr, test_cand[i].corr, test_cand[i].tol);
+    }
 
     /* expected results: */
-    fail_unless(test_cand[0].pnr = 1);
+    fail_unless(test_cand[0].pnr == 0);
     fail_unless(test_cand[0].tol < EPS);
 
     /* regression guard */
@@ -301,9 +305,9 @@ START_TEST(test_find_candidate)
     	sum_corr += test_cand[i].corr;
     }	
 
-    ck_assert_msg( fabs(sum_corr - 2625.) < EPS && 
-                   (count == 4)  && 
-                    fabs(test_cand[3].tol  - 0.565685) < EPS,
+    ck_assert_msg( fabs(sum_corr -3301.0) < EPS && 
+                   (count == 5)  && 
+                    fabs(test_cand[3].tol  - 0.636396) < EPS,
          "\n Expected ...  \n  \
          but found %f %d %9.6f \n", sum_corr, count, test_cand[3].tol);	
 }

diff --git a/py_bind/test/test_corresp.py b/py_bind/test/test_corresp.py
@@ -120,9 +120,9 @@ def test_single_cam_corresp(self):
             targ.set_pixel_counts(25, 5, 5)
             targ.set_sum_grey_value(10)
 
-            img_pts.append(targs)
-            mc = MatchedCoords(targs, cpar, cal)
-            corrected.append(mc)
+        img_pts.append(targs)
+        mc = MatchedCoords(targs, cpar, cal)
+        corrected.append(mc)
 
         _, _, num_targs = correspondences(
             img_pts, corrected, cals, vpar, cpar)