Changeset 29683

Timestamp:

Nov 5, 2010, 10:52:41 AM (16 years ago)

Author:

eugene

Message:

report the interpolation mode name in the test

File:

• branches/eam_branches/ipp-20101103/psLib/test/imageops/tap_psImageInterpolate3.c (modified) (4 diffs)

branches/eam_branches/ipp-20101103/psLib/test/imageops/tap_psImageInterpolate3.c

@@ -39 +39 @@
            psElemType type,             // Type for image
            int num,                     // Number of samples over image
-           psImageInterpolateMode mode, // Interpolation mode
+           char *modeName, // Interpolation mode
            int xKernel, int yKernel,    // Size of interpolation kernel
            float tol,                    // Tolerance
@@ -49 +49 @@
     psImage *image = NULL;
 
+    psImageInterpolateMode mode = psImageInterpolateModeFromString(modeName);
     // psImageMaskType maskVal;
 
@@ -85 +86 @@
         psFree (interp);
     }
+
+    fprintf (stderr, "results for interpolation mode %s\n", modeName);
 
     // measure the interpolate variance value at the specified locations
@@ -137 +140 @@
     plan_tests(6);
 
-    check(16, 16, PS_TYPE_F32, NTESTS, PS_INTERPOLATE_BILINEAR, 2, 2, 1.0e-6, rnd); // 66 tests
-    // check(16, 16, PS_TYPE_F64, 32, PS_INTERPOLATE_BILINEAR, 2, 2, 1.0e-6); // 66 tests
+    check(16, 16, PS_TYPE_F32, NTESTS, "BILINEAR", 2, 2, 1.0e-6, rnd); // 66 tests
+    // check(16, 16, PS_TYPE_F64, NTESTS, "BILINEAR", 2, 2, 1.0e-6); // 66 tests
 
-    check(16, 16, PS_TYPE_F32, NTESTS, PS_INTERPOLATE_BIQUADRATIC, 3, 3, 1.0e-6, rnd); // 66 tests
-    // check(16, 16, PS_TYPE_F64, 32, PS_INTERPOLATE_BIQUADRATIC, 3, 3, 1.0e-6); // 66 tests
+    check(16, 16, PS_TYPE_F32, NTESTS, "BIQUADRATIC", 3, 3, 1.0e-6, rnd); // 66 tests
+    // check(16, 16, PS_TYPE_F64, NTESTS, "BIQUADRATIC", 3, 3, 1.0e-6); // 66 tests
 
-    check(16, 16, PS_TYPE_F32, NTESTS, PS_INTERPOLATE_GAUSS, 3, 3, 1.0e-3, rnd); // 66 tests
-    // check(16, 16, PS_TYPE_F64, 32, PS_INTERPOLATE_GAUSS, 3, 3, 1.0e-3); // 66 tests
+    check(16, 16, PS_TYPE_F32, NTESTS, "GAUSS", 3, 3, 1.0e-3, rnd); // 66 tests
+    // check(16, 16, PS_TYPE_F64, NTESTS, "GAUSS", 3, 3, 1.0e-3); // 66 tests
 
-    check(16, 16, PS_TYPE_F32, NTESTS, PS_INTERPOLATE_LANCZOS2, 4, 4, 1.0e-3, rnd); // 66 tests
-    // check(16, 16, PS_TYPE_F64, 32, PS_INTERPOLATE_LANCZOS2, 4, 4, 1.0e-3); // 66 tests
+    check(16, 16, PS_TYPE_F32, NTESTS, "LANCZOS2", 4, 4, 1.0e-3, rnd); // 66 tests
+    // check(16, 16, PS_TYPE_F64, NTESTS, "LANCZOS2", 4, 4, 1.0e-3); // 66 tests
 
-    check(32, 32, PS_TYPE_F32, NTESTS, PS_INTERPOLATE_LANCZOS3, 6, 6, 1.0e-3, rnd); // 66 tests
-    // check(32, 32, PS_TYPE_F64, 32, PS_INTERPOLATE_LANCZOS3, 6, 6, 1.0e-3); // 66 tests
+    check(32, 32, PS_TYPE_F32, NTESTS, "LANCZOS3", 6, 6, 1.0e-3, rnd); // 66 tests
+    // check(32, 32, PS_TYPE_F64, NTESTS, "LANCZOS3", 6, 6, 1.0e-3); // 66 tests
 
-    check(32, 32, PS_TYPE_F32, NTESTS, PS_INTERPOLATE_LANCZOS4, 8, 8, 1.0e-3, rnd); // 66 tests
-    // check(32, 32, PS_TYPE_F64, 32, PS_INTERPOLATE_LANCZOS4, 8, 8, 1.0e-3); // 66 tests
+    check(32, 32, PS_TYPE_F32, NTESTS, "LANCZOS4", 8, 8, 1.0e-3, rnd); // 66 tests
+    // check(32, 32, PS_TYPE_F64, NTESTS, "LANCZOS4", 8, 8, 1.0e-3); // 66 tests
 
     psFree (rnd);