Changeset 5096

Timestamp:

Sep 22, 2005, 12:49:29 PM (21 years ago)

Author:

gusciora

Message:

Implementing the psPoly nOrder/nTerm switch.

Location:

trunk/psLib

Files:

• src/imageops/psImageStats.c (modified) (6 diffs)
• src/math/psPolynomial.c (modified) (5 diffs)
• test/imageops/tst_psImageStats.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-22 02:47:16 $
+ *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-22 22:49:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -349 +349 @@
     // Free the Chebyshev polynomials that were
     // created in this routine.
-    for (i = 0; i < maxChebyPoly; i++) {
+    for (i = 0; i < maxChebyPoly + 1; i++) {
         psFree(chebPolys[i]);
     }
@@ -453 +453 @@
         maxChebyPoly = coeffs->COOL_2D_nY;
     }
-    chebPolys = 1 + p_psCreateChebyshevPolys(maxChebyPoly);
+    chebPolys = p_psCreateChebyshevPolys(maxChebyPoly + 1);
 
     // Compute the sums[][] data structure.
@@ -498 +498 @@
     // Free the Chebyshev polynomials that were
     // created in this routine.
-    for (i = 0; i < maxChebyPoly; i++) {
+    for (i = 0; i < maxChebyPoly + 1; i++) {
         psFree(chebPolys[i]);
     }
@@ -545 +545 @@
     }
 
-    chebPolys = 1 + p_psCreateChebyshevPolys(maxChebyPoly);
+    chebPolys = p_psCreateChebyshevPolys(maxChebyPoly + 1);
 
     for (x = 0; x < input->numRows; x++) {
@@ -574 +574 @@
     // created in this routine.
     // XXX: Use static data structures here.
-    for (i = 0; i < maxChebyPoly; i++) {
+    for (i = 0; i < maxChebyPoly + 1; i++) {
         psFree(chebPolys[i]);
     }

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
 *  polynomials.  It also contains a Gaussian functions.
 *
-*  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-22 22:22:15 $
+*  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-22 22:49:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -167 +167 @@
 static psPolynomial1D **createChebyshevPolys(psS32 maxChebyPoly)
 {
-    //printf("createChebyshevPolys(%d)\n", maxChebyPoly);
     PS_ASSERT_INT_NONNEGATIVE(maxChebyPoly, NULL);
 
@@ -188 +187 @@
             for (psS32 j = 0; j < chebPolys[i - 1]->COOL_1D_n; j++) {
                 chebPolys[i]->coeff[j + 1] = 2 * chebPolys[i - 1]->coeff[j];
-                //printf("chebPolys[%d]->coeff[%d] is %.2f\n", i, j + 1, chebPolys[i]->coeff[j + 1]);
             }
             for (psS32 j = 0; j < chebPolys[i - 2]->COOL_1D_n; j++) {
                 chebPolys[i]->coeff[j] -= chebPolys[i - 2]->coeff[j];
-                //printf("chebPolys[%d]->coeff[%d] is %.2f\n", i, j, chebPolys[i]->coeff[j]);
             }
         }
@@ -209 +206 @@
                                  const psPolynomial1D* poly)
 {
-    //printf("ordPolynomial1DEval(%f): ", x);
-    //for (psS32 i = 0 ; i < (1 + poly->COOL_1D_n) ; i++) printf("(%.2f) ", poly->coeff[i]);
-    //printf("\n");
-
     unsigned int loop_x = 0;
     psF64 polySum = 0.0;
@@ -545 +538 @@
                 for (loop_t = 0; loop_t < (1 + poly->COOL_4D_nT); loop_t++) {
                     if (poly->mask[loop_x][loop_y][loop_z][loop_t] == 0) {
-                        //printf("HMMM (%d, %d, %d, %d)\n", loop_x, loop_y, loop_z, loop_t);
-                        //printf("HMMM (%d, %d, %d, %d)\n", chebPolys[loop_x]->COOL_1D_n, chebPolys[loop_y]->COOL_1D_n, chebPolys[loop_z]->COOL_1D_n, chebPolys[loop_t]->COOL_1D_n);
-                        //printf("chebPolynomial4DEval()\n");
                         polySum += poly->coeff[loop_x][loop_y][loop_z][loop_t] *
                                    psPolynomial1DEval(chebPolys[loop_x], x) *

trunk/psLib/test/imageops/tst_psImageStats.c

@@ -28 +28 @@
 
 testDescription tests[] = {
-                              {testPsImageHistogram,0,"psImageHistogram",0,false},
-                              {testPsImageStats,1,"psImageStats",0,false},
-                              {testPsImageFitPolynomial,2,"psImageFitPolynomial",0,false},
-                              {testPsImagePixelInterpolate,3,"psImagePixelInterpolate",0,false},
-                              {testPsImageEvalPolynom,4,"psImageEvalPolynom()",0,false},
+                              {testPsImageHistogram, 0, "psImageHistogram", 0, false},
+                              {testPsImageStats, 1, "psImageStats", 0, false},
+                              {testPsImageFitPolynomial, 2, "psImageFitPolynomial", 0, false},
+                              {testPsImagePixelInterpolate, 3, "psImagePixelInterpolate", 0, false},
+                              {testPsImageEvalPolynom, 4, "psImageEvalPolynom()", 0, false},
                               {NULL}
                           };
@@ -38 +38 @@
 psS32 main(psS32 argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
 
@@ -374 +375 @@
 }
 
+// HEY: XXX
 static psS32 testPsImageFitPolynomial()
 {
-    const int IMAGE_SIZE = 64;
+    const int IMAGE_SIZE = 16;
     const int CHEBY_X_DIM = 8;
     const int CHEBY_Y_DIM = 8;
@@ -406 +408 @@
         }
     }
-    my2DPoly = psPolynomial2DAlloc( CHEBY_X_DIM, CHEBY_Y_DIM, PS_POLYNOMIAL_CHEB );
+    my2DPoly = psPolynomial2DAlloc( CHEBY_X_DIM-1, CHEBY_Y_DIM-1, PS_POLYNOMIAL_CHEB );
     /*************************************************************************/
     /*  Calculate Chebyshev Polynomials, no mask                     */
     /*************************************************************************/
     my2DPoly = psImageFitPolynomial( my2DPoly, tmpImage );
+    if (my2DPoly == NULL) {
+        printf("TEST ERROR: psImageFitPolynomial() returned NULL.\n");
+        testStatus = false;
+    }
     for ( i = 0;i < CHEBY_X_DIM;i++ ) {
         for ( j = 0;j < CHEBY_Y_DIM;j++ ) {
@@ -447 +453 @@
         }
     }
-
 
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error message for NULL coeffs argument.");