Changeset 1939

Timestamp:

Sep 30, 2004, 1:06:36 PM (22 years ago)

Author:

gusciora

Message:

Removed some test code.

Location:

trunk/psLib/src

Files:

• image/psImageStats.c (modified) (6 diffs)
• imageops/psImageStats.c (modified) (6 diffs)

trunk/psLib/src/image/psImageStats.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-25 19:11:01 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-30 23:06:36 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -195 +195 @@
 }
 
-psPolynomial1D* *p_psCreateChebyshevPolys(int maxChebyPoly)
+psPolynomial1D **p_psCreateChebyshevPolys(int maxChebyPoly)
 {
     psPolynomial1D **chebPolys = NULL;
@@ -247 +247 @@
     float *cScalingFactors = NULL;
     float *rScalingFactors = NULL;
-    float tmp = 0.0;
 
     // Create the sums[][] data structure.  This
@@ -258 +257 @@
         sums[i] = (float *)psAlloc(coeffs->nY * sizeof(float));
     }
-
     // We scale the pixel positions to values
     // between -1.0 and 1.0
@@ -272 +270 @@
     chebPolys = p_psCreateChebyshevPolys(maxChebyPoly);
 
-    // Sanity check for the Chebyshevs.
-    for (i = 0; i < coeffs->nX; i++) {
-        for (j = 0; j < coeffs->nY; j++) {
-            tmp = 0.0;
-            for (x = 0; x < input->numRows; x++) {
-                tmp +=
-                    psPolynomial1DEval
-                    (rScalingFactors[x], chebPolys[i]) * psPolynomial1DEval(rScalingFactors[x], chebPolys[j]);
-
+
+    /*
+        // Sanity check for the Chebyshevs.
+        for (i = 0; i < coeffs->nX; i++) {
+            for (j = 0; j < coeffs->nY; j++) {
+                tmp = 0.0;
+                for (x = 0; x < input->numRows; x++) {
+                    tmp +=
+                        psPolynomial1DEval
+                        (rScalingFactors[x], chebPolys[i]) * psPolynomial1DEval(rScalingFactors[x], chebPolys[j]);
+     
+                }
+                // printf("SUM(Cheby(%d) * Cheby(%d))
+                // is %f\n", i, j, tmp);
             }
-            // printf("SUM(Cheby(%d) * Cheby(%d))
-            // is %f\n", i, j, tmp);
-        }
-    }
+        }
+    */
 
     // Compute the sums[][] data structure.
@@ -295 +296 @@
                     sums[i][j] +=
                         input->data.F32[x][y] *
-                        psPolynomial1DEval
-                        (rScalingFactors[x],
-                         chebPolys[i]) * psPolynomial1DEval(cScalingFactors[y], chebPolys[j]);
+                        psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
+                        psPolynomial1DEval(cScalingFactors[y], chebPolys[j]);
                 }
             }

trunk/psLib/src/imageops/psImageStats.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-25 19:11:01 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-30 23:06:36 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -195 +195 @@
 }
 
-psPolynomial1D* *p_psCreateChebyshevPolys(int maxChebyPoly)
+psPolynomial1D **p_psCreateChebyshevPolys(int maxChebyPoly)
 {
     psPolynomial1D **chebPolys = NULL;
@@ -247 +247 @@
     float *cScalingFactors = NULL;
     float *rScalingFactors = NULL;
-    float tmp = 0.0;
 
     // Create the sums[][] data structure.  This
@@ -258 +257 @@
         sums[i] = (float *)psAlloc(coeffs->nY * sizeof(float));
     }
-
     // We scale the pixel positions to values
     // between -1.0 and 1.0
@@ -272 +270 @@
     chebPolys = p_psCreateChebyshevPolys(maxChebyPoly);
 
-    // Sanity check for the Chebyshevs.
-    for (i = 0; i < coeffs->nX; i++) {
-        for (j = 0; j < coeffs->nY; j++) {
-            tmp = 0.0;
-            for (x = 0; x < input->numRows; x++) {
-                tmp +=
-                    psPolynomial1DEval
-                    (rScalingFactors[x], chebPolys[i]) * psPolynomial1DEval(rScalingFactors[x], chebPolys[j]);
-
+
+    /*
+        // Sanity check for the Chebyshevs.
+        for (i = 0; i < coeffs->nX; i++) {
+            for (j = 0; j < coeffs->nY; j++) {
+                tmp = 0.0;
+                for (x = 0; x < input->numRows; x++) {
+                    tmp +=
+                        psPolynomial1DEval
+                        (rScalingFactors[x], chebPolys[i]) * psPolynomial1DEval(rScalingFactors[x], chebPolys[j]);
+     
+                }
+                // printf("SUM(Cheby(%d) * Cheby(%d))
+                // is %f\n", i, j, tmp);
             }
-            // printf("SUM(Cheby(%d) * Cheby(%d))
-            // is %f\n", i, j, tmp);
-        }
-    }
+        }
+    */
 
     // Compute the sums[][] data structure.
@@ -295 +296 @@
                     sums[i][j] +=
                         input->data.F32[x][y] *
-                        psPolynomial1DEval
-                        (rScalingFactors[x],
-                         chebPolys[i]) * psPolynomial1DEval(cScalingFactors[y], chebPolys[j]);
+                        psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
+                        psPolynomial1DEval(cScalingFactors[y], chebPolys[j]);
                 }
             }