Changeset 12094 for trunk/psLib/test/imageops

Timestamp:

Feb 27, 2007, 1:56:12 PM (19 years ago)

Author:

gusciora

Message:

Made several changes to keep the tap tests up-to-date with recent src
changes.

Location:

trunk/psLib/test/imageops

Files:

• Makefile.am (modified) (1 diff)
• tap_psImageConvolve.c (modified) (9 diffs)
• tap_psImagePixelManip.c (modified) (3 diffs)
• tap_psImageShiftKernel.c (modified) (1 diff)
• tap_psImageSmooth.c (modified) (2 diffs)

trunk/psLib/test/imageops/Makefile.am

@@ -24 +24 @@
         tap_psImagePixelExtract
 
-noinst_PROGRAMS = \
-        convolutionBench
-
 if BUILD_TESTS
 bin_PROGRAMS = $(TEST_PROGS)

trunk/psLib/test/imageops/tap_psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 22:30:14 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
+ *
+ *  XXX: Must test the tRelative parameter to psKernelGenerate()
+ *  XXX: Must test psImageConvolveFFT()
+ *  XXX: Make sure psImageConvolveDirect() is correct.
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -95 +99 @@
         }
 
-        psKernel* result = psKernelGenerate(tVec, xVec, yVec, false);
+        psKernel* result = psKernelGenerate(tVec, xVec, yVec, false, false);
         ok(result != NULL, "psKernelGenerate() returned non-NULL");
         skip_start(result == NULL, 3, "Skipping tests because psKernelGenerate() returned NULL");
@@ -143 +147 @@
         }
 
-        psKernel *result = psKernelGenerate(tVec, xVec, yVec, true);
+        psKernel *result = psKernelGenerate(tVec, xVec, yVec, false, true);
         ok(result != NULL, "psKernelGenerate() returned non-NULL");
         skip_start(result == NULL, 3, "Skipping tests because psKernelGenerate() returned NULL");
@@ -197 +201 @@
 
         tVec->n--; // decrease size by one to make vectors unequal in length.
-        psKernel *result = psKernelGenerate(tVec, xVec, yVec, false);
+        psKernel *result = psKernelGenerate(tVec, xVec, yVec, false, false);
         ok(result == NULL, "psKernelGenerate returned NULL given differing sized vectors");
         psFree(result);
@@ -213 +217 @@
     {
         psMemId id = psMemGetId();
-        psKernel *result = psKernelGenerate(NULL, xVec, yVec, true);
+        psKernel *result = psKernelGenerate(NULL, xVec, yVec, false, true);
         ok(result == NULL, "psKernelGenerate returned NULL with no time vector");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -222 +226 @@
     {
         psMemId id = psMemGetId();
-        psKernel *result = psKernelGenerate(tVec, NULL, yVec, true);
+        psKernel *result = psKernelGenerate(tVec, NULL, yVec, false, true);
         ok(result == NULL, "psKernelGenerate returned NULL with no x vector");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -231 +235 @@
     {
         psMemId id = psMemGetId();
-        psKernel *result = psKernelGenerate(tVec, xVec, NULL, true);
+        psKernel *result = psKernelGenerate(tVec, xVec, NULL, false, true);
         ok(result == NULL, "psKernelGenerate returned NULL with no y vector");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -282 +286 @@
     if (0) {
         psMemId id = psMemGetId();
-        psImage* out = psImageConvolve(NULL, img, g, true);
-        ok(out != NULL, "psImageConvolve() returned non-NULL");
-        skip_start(out == NULL, 3, "Skipping tests because psImageConvolve() returned NULL");
+        psImage* out = psImageConvolveDirect(NULL, img, g);
+        ok(out != NULL, "psImageConvolveDirect() returned non-NULL");
+        skip_start(out == NULL, 3, "Skipping tests because psImageConvolveDirect() returned NULL");
         ok(out->numCols == c && out->numRows == r,
-           "psImageConvolve result image is %dx%d, expected %dx%d",
+           "psImageConvolveDirect result image is %dx%d, expected %dx%d",
            out->numCols, out->numRows, c,r);
-        ok(out->type.type == PS_TYPE_F32, "psImageConvolve() produced the correct type");
+        ok(out->type.type == PS_TYPE_F32, "psImageConvolveDirect() produced the correct type");
 
         // test values
@@ -318 +322 @@
 
     // test fourier convolution of gaussian
-    ok(false, "XXXX: Skipping this psImageConvolve() because of bugs");
+    ok(false, "XXXX: Skipping this psImageConvolveDirect() because of bugs");
     if (0) {
         psMemId id = psMemGetId();
-        psImage* out = psImageConvolve(NULL, img, g, true);
-        psImage* out2 = psImageConvolve(out, img, g, false);
-
-        ok(out != NULL, "psImageConvolve() returned non-NULL");
-        ok(out2 != NULL, "psImageConvolve() returned non-NULL");
-        skip_start(out == NULL || out2 == NULL, 3, "Skipping tests because psImageConvolve() returned NULL");
-        ok(out == out2, "psImageConvolve did recycle the supplied out image struct");
+        psImage* out = psImageConvolveDirect(NULL, img, g);
+        psImage* out2 = psImageConvolveDirect(out, img, g);
+
+        ok(out != NULL, "psImageConvolveDirect() returned non-NULL");
+        ok(out2 != NULL, "psImageConvolveDirect() returned non-NULL");
+        skip_start(out == NULL || out2 == NULL, 3, "Skipping tests because psImageConvolveDirect() returned NULL");
+        ok(out == out2, "psImageConvolveDirect did recycle the supplied out image struct");
         ok(out->numCols == c && out->numRows == r,
-           "psImageConvolve result image is %dx%d, expected %dx%d",
+           "psImageConvolveDirect result image is %dx%d, expected %dx%d",
            out->numCols, out->numRows, c,r);
-        ok(out->type.type == PS_TYPE_F32, "psImageConvolve() produced the correct type");
+        ok(out->type.type == PS_TYPE_F32, "psImageConvolveDirect() produced the correct type");
 
         // test values

trunk/psLib/test/imageops/tap_psImagePixelManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 22:50:18 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -686 +686 @@
         // Verify program execution doen't stop, if the overly image contains
         // zero values with division operation is specified.
+        // XXX: This currently doesn't work.  Apparently, the psImageOverlaySection()
+        // will happily divide by 0.0.
         for (unsigned row=0;row<r;row++)
         {
@@ -695 +697 @@
         retVal = psImageOverlaySection(img,img2,0,0,"/");
         ok(retVal == 0, "psImageOverlaySection returned zero when checking divide-by-zero");
-
+        printf("XXX: retVal is %d, should be 0\n", retVal);
         psFree(img);
         psFree(img2);

trunk/psLib/test/imageops/tap_psImageShiftKernel.c

@@ -8 +8 @@
 int main (void)
 {
-    plan_tests(39);
+    plan_tests(34);
 
     diag("psImageShiftKernel() tests");

trunk/psLib/test/imageops/tap_psImageSmooth.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-08 01:22:08 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
 
     if (flags & TS00_IM_NULL) {
-        if (VERBOSE)
-            printf("        using a NULL image\n");
+        if (VERBOSE) printf("        using a NULL image\n");
     }
 
     if (flags & TS00_IM_F32) {
-        if (VERBOSE)
-            printf("        using a psF32 image\n");
+        if (VERBOSE) printf("        using a psF32 image\n");
         img = psImageAlloc(numCols, numRows, PS_TYPE_F32);
         // Set a checkboard pattern