Changeset 3723 for trunk/psModules/test/tst_pmObjects01.c

Timestamp:

Apr 19, 2005, 1:44:54 PM (21 years ago)

Author:

gusciora

Message:

pmFindImagePeaks() should now work with images of 1-row, or 1-col.

File:

• trunk/psModules/test/tst_pmObjects01.c (modified) (5 diffs)

trunk/psModules/test/tst_pmObjects01.c

@@ -19 +19 @@
  * abd never deallocate, no error is generated.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 22:58:48 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-19 23:44:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -479 +479 @@
 {
     printf("-------------- Calling test_pmFindVectorPeaks on an %d-by-%d image. --------------\n", numRows, numCols);
-    if ((numRows < 4) || (numCols < 4)) {
-        printf("WARNING: Don't call this test with a smaller than 4-by-4 image.\n");
-        return(true);
-    }
+    //    if ((numRows < 4) || (numCols < 4)) {
+    //        printf("WARNING: Don't call this test with a smaller than 4-by-4 image.\n");
+    //        return(true);
+    //    }
     bool testStatus = true;
     psImage *inData = psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -523 +523 @@
         testStatus = false;
     } else {
-        if (outData->size != 5) {
-            printf("TEST ERROR: pmFindImagePeaks found %d peaks (should be 4)\n", outData->size);
-            testStatus = false;
-        }
-
+        psS32 expectedNumPeaks;
+        if ((numRows == 1) && (numCols == 1)) {
+            expectedNumPeaks = 1;
+        } else if ((numRows == 1) || (numCols == 1)) {
+            expectedNumPeaks = 3;
+        } else {
+            expectedNumPeaks = 5;
+        }
+        if (outData->size != expectedNumPeaks) {
+            printf("TEST ERROR: pmFindImagePeaks found %d peaks (should be %d)\n", outData->size, expectedNumPeaks);
+            testStatus = false;
+        }
+
+        // HEY
         psListElem *tmpPeakLE = (psListElem *) outData->head;
         while (tmpPeakLE != NULL) {
@@ -537 +546 @@
                 if (!(tmpPeak->class & PM_PEAK_LONE) ||
                         !(tmpPeak->class & PM_PEAK_EDGE)) {
-                    printf("TEST ERROR: peak at (%d, %d) (%f) ->class set improperly (0x%x).\n", tmpPeak->y, tmpPeak->x, tmpPeak->counts, tmpPeak->class);
+                    printf("TEST ERROR: (0) peak at (%d, %d) (%f) ->class set improperly (0x%x).\n", tmpPeak->y, tmpPeak->x, tmpPeak->counts, tmpPeak->class);
                     testStatus = false;
                 }
             } else if ((tmpPeak->x == numCols/2) && (tmpPeak->y == numRows/2)) {
                 if (!(tmpPeak->class & PM_PEAK_LONE)) {
-                    printf("TEST ERROR: peak at (%d, %d) (%f) ->class set improperly (0x%x).\n", tmpPeak->y, tmpPeak->x, tmpPeak->counts, tmpPeak->class);
+                    printf("TEST ERROR: (1) peak at (%d, %d) (%f) ->class set improperly (0x%x).\n", tmpPeak->y, tmpPeak->x, tmpPeak->counts, tmpPeak->class);
                     testStatus = false;
                 }
@@ -599 +608 @@
     //    testStatus&= test_pmFindImagePeaks(5, 2);
     // HEY
+    testStatus&= test_pmFindImagePeaks(1, 1);
+    testStatus&= test_pmFindImagePeaks(1, 8);
+    testStatus&= test_pmFindImagePeaks(8, 1);
     testStatus&= test_pmFindImagePeaks(TST02_NUM_ROWS,   TST02_NUM_COLS);
     testStatus&= test_pmFindImagePeaks(2*TST02_NUM_ROWS, TST02_NUM_COLS);