Changeset 1072

Timestamp:

Jun 23, 2004, 11:41:15 AM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib

Files:

• src/image/psImageStats.c (modified) (5 diffs)
• src/imageops/psImageStats.c (modified) (5 diffs)
• test/dataManip/builddir/tst_psFunc00.d (modified) (1 diff)
• test/dataManip/builddir/tst_psFunc01.d (modified) (1 diff)
• test/dataManip/builddir/tst_psHist00.d (modified) (1 diff)
• test/dataManip/builddir/tst_psHist01.d (modified) (1 diff)
• test/dataManip/builddir/tst_psHist02.d (modified) (1 diff)
• test/dataManip/builddir/tst_psImageFFT.d (modified) (1 diff)
• test/dataManip/builddir/tst_psImageIO.d (modified) (1 diff)
• test/dataManip/builddir/tst_psImageStats00.d (modified) (1 diff)
• test/dataManip/builddir/tst_psImageStats01.d (modified) (1 diff)
• test/dataManip/builddir/tst_psImageStats02.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix01.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix02.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix03.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix04.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix05.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix06.d (modified) (1 diff)
• test/dataManip/builddir/tst_psMatrix07.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats00.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats01.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats02.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats03.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats05.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats06.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats07.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats08.d (modified) (1 diff)
• test/dataManip/builddir/tst_psStats09.d (modified) (1 diff)
• test/dataManip/builddir/tst_psVectorFFT.d (modified) (1 diff)
• test/image/tst_psImageStats02.c (modified) (4 diffs)

trunk/psLib/src/image/psImageStats.c

@@ -155 +155 @@
 }
 
+/*****************************************************************************
+p_psCalcScaleFactorsEval(n): The Chebyshev polynomials are defined over the
+interval [-1.0 : 1.0].  Images typically have sizes of 512x512 or more.  In
+order to use Chebyshev polynomials, we must scales the coordinates from
+0:512 to -1:1.  This routine takes as input an integer N and produces as
+output a vector of evenly spaced floating point values between -1.0:1.0.
+ *****************************************************************************/
 float *p_psCalcScaleFactorsEval(int n)
 {
@@ -200 +207 @@
 
 /*****************************************************************************
-    psImageFitPolynomial():
- This routine takes as input a 2-D image and produces as output
- the coefficients of the Chebyshev polynomials which match that
- input image.
-    Input:
-    Output:
-    Internal Data Structures:
- 
- chebPolys[i][j] 
- 
- sums[i][j]: This will contain the sum of 
-  input->data.F32[x][y] *
+psImageFitPolynomial(): This routine takes as input a 2-D image and produces
+as output the coefficients of the Chebyshev polynomials which match that
+input image.
+  Input:
+  Output:
+  Internal Data Structures:
+    chebPolys[i][j] 
+    sums[i][j]: This will contain the sum of 
+                input->data.F32[x][y] *
                 psEvalPolynomial1D((float) x, chebPolys[i]) *
                 psEvalPolynomial1D((float) y, chebPolys[j]);
-      over all pixels (x,y) in the image.
- 
- 
+        over all pixels (x,y) in the image.
  *****************************************************************************/
 psPolynomial2D *
@@ -253 +255 @@
     chebPolys = p_psCreateChebyshevPolys(maxChebyPoly);
 
-    // Sanity check for the Chebyshevs
+    // Sanity check for the Chebyshevs.
     for (i=0;i<coeffs->nX;i++) {
         for (j=0;j<coeffs->nY;j++) {
@@ -262 +264 @@
 
             }
-        }
-    }
-
+            printf("SUM(Cheby(%d) * Cheby(%d)) is %f\n", i, j, tmp);
+        }
+    }
+
+    // Compute the sums[][] data structure.
     for (i=0;i<coeffs->nX;i++) {
         for (j=0;j<coeffs->nY;j++) {
@@ -279 +283 @@
 
     // NOTE: Check the math on this at a later date.
-    coeffs->coeff[0][0] = sums[0][0] / ((float) (coeffs->nX * coeffs->nY));
-    for (i=0;i<coeffs->nX;i++) {
-        coeffs->coeff[i][0] = ((sums[i][0] * 2.0) /
-                               ((float) (coeffs->nX * coeffs->nY))) -
-                              coeffs->coeff[0][0];
-    }
-    for (j=0;j<coeffs->nY;j++) {
-        coeffs->coeff[0][j] =
-            ((sums[0][j] * 2.0) /
-             ((float) (coeffs->nX * coeffs->nY))) -
-            coeffs->coeff[0][0];
-    }
-    for (i=1;i<coeffs->nX;i++) {
-        for (j=1;j<coeffs->nY;j++) {
-            coeffs->coeff[i][j] =
-                ((sums[i][0] * 4.0) / ((float) (coeffs->nX * coeffs->nY))) -
-                (coeffs->coeff[0][0] +
-                 coeffs->coeff[i][0] +
-                 coeffs->coeff[0][j]);
+    //    coeffs->coeff[0][0] = sums[0][0] / ((float) (coeffs->nX * coeffs->nY));
+    //    for (i=0;i<coeffs->nX;i++) {
+    //        coeffs->coeff[i][0] = ((sums[i][0] * 2.0) /
+    //                               ((float) (coeffs->nX * coeffs->nY))) -
+    //                              coeffs->coeff[0][0];
+    //    }
+    //    for (j=0;j<coeffs->nY;j++) {
+    //        coeffs->coeff[0][j] =
+    //            ((sums[0][j] * 2.0) /
+    //             ((float) (coeffs->nX * coeffs->nY))) -
+    //            coeffs->coeff[0][0];
+    //    }
+
+    for (i=0;i<coeffs->nX;i++) {
+        for (j=0;j<coeffs->nY;j++) {
+            coeffs->coeff[i][j] = sums[i][j];
+            coeffs->coeff[i][j]/= ((float) coeffs->nX) * ((float) coeffs->nY);
+            if ((i != 0) && (j != 0)) {
+                coeffs->coeff[i][j]*= 4.0;
+            } else if ((i == 0) && (j == 0)) {
+                coeffs->coeff[i][j]*= 1.0;
+            } else {
+                coeffs->coeff[i][j]*= 2.0;
+            }
+
+            //            coeffs->coeff[i][j] =
+            //                ((sums[i][0] * 4.0) / ((float) (coeffs->nX * coeffs->nY))) -
+            //                (coeffs->coeff[0][0] +
+            //                 coeffs->coeff[i][0] +
+            //                 coeffs->coeff[0][j]);
         }
     }

trunk/psLib/src/imageops/psImageStats.c

@@ -155 +155 @@
 }
 
+/*****************************************************************************
+p_psCalcScaleFactorsEval(n): The Chebyshev polynomials are defined over the
+interval [-1.0 : 1.0].  Images typically have sizes of 512x512 or more.  In
+order to use Chebyshev polynomials, we must scales the coordinates from
+0:512 to -1:1.  This routine takes as input an integer N and produces as
+output a vector of evenly spaced floating point values between -1.0:1.0.
+ *****************************************************************************/
 float *p_psCalcScaleFactorsEval(int n)
 {
@@ -200 +207 @@
 
 /*****************************************************************************
-    psImageFitPolynomial():
- This routine takes as input a 2-D image and produces as output
- the coefficients of the Chebyshev polynomials which match that
- input image.
-    Input:
-    Output:
-    Internal Data Structures:
- 
- chebPolys[i][j] 
- 
- sums[i][j]: This will contain the sum of 
-  input->data.F32[x][y] *
+psImageFitPolynomial(): This routine takes as input a 2-D image and produces
+as output the coefficients of the Chebyshev polynomials which match that
+input image.
+  Input:
+  Output:
+  Internal Data Structures:
+    chebPolys[i][j] 
+    sums[i][j]: This will contain the sum of 
+                input->data.F32[x][y] *
                 psEvalPolynomial1D((float) x, chebPolys[i]) *
                 psEvalPolynomial1D((float) y, chebPolys[j]);
-      over all pixels (x,y) in the image.
- 
- 
+        over all pixels (x,y) in the image.
  *****************************************************************************/
 psPolynomial2D *
@@ -253 +255 @@
     chebPolys = p_psCreateChebyshevPolys(maxChebyPoly);
 
-    // Sanity check for the Chebyshevs
+    // Sanity check for the Chebyshevs.
     for (i=0;i<coeffs->nX;i++) {
         for (j=0;j<coeffs->nY;j++) {
@@ -262 +264 @@
 
             }
-        }
-    }
-
+            printf("SUM(Cheby(%d) * Cheby(%d)) is %f\n", i, j, tmp);
+        }
+    }
+
+    // Compute the sums[][] data structure.
     for (i=0;i<coeffs->nX;i++) {
         for (j=0;j<coeffs->nY;j++) {
@@ -279 +283 @@
 
     // NOTE: Check the math on this at a later date.
-    coeffs->coeff[0][0] = sums[0][0] / ((float) (coeffs->nX * coeffs->nY));
-    for (i=0;i<coeffs->nX;i++) {
-        coeffs->coeff[i][0] = ((sums[i][0] * 2.0) /
-                               ((float) (coeffs->nX * coeffs->nY))) -
-                              coeffs->coeff[0][0];
-    }
-    for (j=0;j<coeffs->nY;j++) {
-        coeffs->coeff[0][j] =
-            ((sums[0][j] * 2.0) /
-             ((float) (coeffs->nX * coeffs->nY))) -
-            coeffs->coeff[0][0];
-    }
-    for (i=1;i<coeffs->nX;i++) {
-        for (j=1;j<coeffs->nY;j++) {
-            coeffs->coeff[i][j] =
-                ((sums[i][0] * 4.0) / ((float) (coeffs->nX * coeffs->nY))) -
-                (coeffs->coeff[0][0] +
-                 coeffs->coeff[i][0] +
-                 coeffs->coeff[0][j]);
+    //    coeffs->coeff[0][0] = sums[0][0] / ((float) (coeffs->nX * coeffs->nY));
+    //    for (i=0;i<coeffs->nX;i++) {
+    //        coeffs->coeff[i][0] = ((sums[i][0] * 2.0) /
+    //                               ((float) (coeffs->nX * coeffs->nY))) -
+    //                              coeffs->coeff[0][0];
+    //    }
+    //    for (j=0;j<coeffs->nY;j++) {
+    //        coeffs->coeff[0][j] =
+    //            ((sums[0][j] * 2.0) /
+    //             ((float) (coeffs->nX * coeffs->nY))) -
+    //            coeffs->coeff[0][0];
+    //    }
+
+    for (i=0;i<coeffs->nX;i++) {
+        for (j=0;j<coeffs->nY;j++) {
+            coeffs->coeff[i][j] = sums[i][j];
+            coeffs->coeff[i][j]/= ((float) coeffs->nX) * ((float) coeffs->nY);
+            if ((i != 0) && (j != 0)) {
+                coeffs->coeff[i][j]*= 4.0;
+            } else if ((i == 0) && (j == 0)) {
+                coeffs->coeff[i][j]*= 1.0;
+            } else {
+                coeffs->coeff[i][j]*= 2.0;
+            }
+
+            //            coeffs->coeff[i][j] =
+            //                ((sums[i][0] * 4.0) / ((float) (coeffs->nX * coeffs->nY))) -
+            //                (coeffs->coeff[0][0] +
+            //                 coeffs->coeff[i][0] +
+            //                 coeffs->coeff[0][j]);
         }
     }

trunk/psLib/test/dataManip/builddir/tst_psFunc00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h \
   ../../include/psFunctions.h

trunk/psLib/test/dataManip/builddir/tst_psFunc01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h \
   ../../include/psFunctions.h

trunk/psLib/test/dataManip/builddir/tst_psHist00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psHist01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psHist02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psImageFFT.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h

trunk/psLib/test/dataManip/builddir/tst_psImageIO.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h

trunk/psLib/test/dataManip/builddir/tst_psImageStats00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h \
   ../../include/psImageStats.h ../../include/psFunctions.h

trunk/psLib/test/dataManip/builddir/tst_psImageStats01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h \
   ../../include/psImageStats.h ../../include/psFunctions.h

trunk/psLib/test/dataManip/builddir/tst_psImageStats02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h \
   ../../include/psImageStats.h ../../include/psFunctions.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix04.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix05.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix06.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psMatrix07.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats05.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats06.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats07.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats08.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/dataManip/builddir/tst_psStats09.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h \
   ../../include/psImageStats.h ../../include/psFunctions.h

trunk/psLib/test/dataManip/builddir/tst_psVectorFFT.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h

trunk/psLib/test/image/tst_psImageStats02.c

@@ -14 +14 @@
 #include "psImage.h"
 #include "psImageStats.h"
+#include <float.h>
+#include <math.h>
 #define IMAGE_SIZE 3
 #define CHEBY_X_DIM 3
 #define CHEBY_Y_DIM 3
-
+#define THRESHOLD 1.0
 int main()
 {
@@ -39 +41 @@
     for (i=0;i<IMAGE_SIZE;i++) {
         for (j=0;j<IMAGE_SIZE;j++) {
+            tmpImage->data.F32[i][j] = 4.0;
             tmpImage->data.F32[i][j] = (float) (i + j);
-            tmpImage->data.F32[i][j] = 4.0;
+            tmpImage->data.F32[i][j] = (float) (i + j) + (4.0 * (float) i);
             outImage->data.F32[i][j] = 0.0;
         }
@@ -53 +56 @@
 
     my2DPoly = psImageFitPolynomial(tmpImage, my2DPoly);
+    for (i=0;i<CHEBY_X_DIM;i++) {
+        for (j=0;j<CHEBY_Y_DIM;j++) {
+            printf("Cheby Polynomial (%d, %d) coefficient is %f\n", i, j, my2DPoly->coeff[i][j]);
+        }
+    }
 
     psMemCheckCorruption(1);
@@ -67 +75 @@
 
     rc = psImageEvalPolynomial(outImage, my2DPoly);
-    //    for (i=0;i<IMAGE_SIZE;i++) {
-    //        for (j=0;j<IMAGE_SIZE;j++) {
-    //             printf("pixel[%d][%d] is (%f, %f)\n", i, j,
-    //                   tmpImage->data.F32[i][j],
-    //                   outImage->data.F32[i][j]);
-    //        }
-    //    }
+    for (i=0;i<IMAGE_SIZE;i++) {
+        for (j=0;j<IMAGE_SIZE;j++) {
+
+            //             printf("pixel[%d][%d] is (%f, %f)\n", i, j,
+            //                     tmpImage->data.F32[i][j],
+            //                     outImage->data.F32[i][j]);
+            if (fabs(outImage->data.F32[i][j] - tmpImage->data.F32[i][j]) > THRESHOLD) {
+                printf("Pixel (%d, %d) is %f, should be %f\n", i, j,
+                       outImage->data.F32[i][j],
+                       tmpImage->data.F32[i][j]);
+            }
+
+        }
+    }
 
     psMemCheckCorruption(1);