Changeset 1725 for trunk/psLib/src/dataManip/psFunctions.c

Timestamp:

Sep 7, 2004, 9:11:22 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/dataManip/psFunctions.c (modified) (13 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 06:24:17 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 07:11:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
- *
- *  XXX: currently coefficient masks are not used in polynomial evaluation.
- *
  */
 /*****************************************************************************/
@@ -198 +195 @@
         newPoly->coeff[i] = 0.0;
         newPoly->coeffErr[i] = 0.0;
-        newPoly->mask[i] = 0.0;
+        newPoly->mask[i] = 0;
     }
 
@@ -428 +425 @@
 
     for (loop_x = 0; loop_x < myPoly->n; loop_x++) {
-        polySum += xSum * myPoly->coeff[loop_x];
-        xSum *= x;
+        if (myPoly->mask[loop_x] != 0) {
+            polySum += xSum * myPoly->coeff[loop_x];
+            xSum *= x;
+        }
     }
 
@@ -436 +435 @@
 
 // XXX: You can do this without having to psAlloc() vector d.
+// XXX: How does the mask vector effect Crenshaw's formula?
 float p_psChebPolynomial1DEval(float x, const psPolynomial1D* myPoly)
 {
@@ -505 +505 @@
         ySum = xSum;
         for (loop_y = 0; loop_y < myPoly->nY; loop_y++) {
-            polySum += ySum * myPoly->coeff[loop_x][loop_y];
-            ySum *= y;
+            if (myPoly->mask[loop_x][loop_y] != 0) {
+                polySum += ySum * myPoly->coeff[loop_x][loop_y];
+                ySum *= y;
+            }
         }
         xSum *= x;
@@ -584 +586 @@
             zSum = ySum;
             for (loop_z = 0; loop_z < myPoly->nZ; loop_z++) {
-                polySum += zSum * myPoly->coeff[loop_x][loop_y][loop_z];
-                zSum *= z;
+                if (myPoly->mask[loop_x][loop_y][loop_z] != 0) {
+                    polySum += zSum * myPoly->coeff[loop_x][loop_y][loop_z];
+                    zSum *= z;
+                }
             }
             ySum *= y;
@@ -681 +685 @@
                 zSum = ySum;
                 for (loop_z = 0; loop_z < myPoly->nZ; loop_z++) {
-                    polySum += zSum * myPoly->coeff[loop_w][loop_x][loop_y][loop_z];
-                    zSum *= z;
+                    if (myPoly->mask[loop_w][loop_x][loop_y][loop_z] != 0) {
+                        polySum += zSum * myPoly->coeff[loop_w][loop_x][loop_y][loop_z];
+                        zSum *= z;
+                    }
                 }
                 ySum *= y;
@@ -787 +793 @@
         newPoly->coeff[i] = 0.0;
         newPoly->coeffErr[i] = 0.0;
-        newPoly->mask[i] = 0.0;
+        newPoly->mask[i] = 0;
     }
 
@@ -1003 +1009 @@
 
     for (loop_x = 0; loop_x < myPoly->n; loop_x++) {
-        polySum += xSum * myPoly->coeff[loop_x];
-        xSum *= x;
+        if (myPoly->mask[loop_x] != 0) {
+            polySum += xSum * myPoly->coeff[loop_x];
+            xSum *= x;
+        }
     }
 
@@ -1011 +1019 @@
 
 // XXX: You can do this without having to psAlloc() vector d.
+// XXX: How does the mask vector effect Crenshaw's formula?
 double p_psDChebPolynomial1DEval(double x, const psDPolynomial1D* myPoly)
 {
@@ -1081 +1090 @@
         ySum = xSum;
         for (loop_y = 0; loop_y < myPoly->nY; loop_y++) {
-            polySum += ySum * myPoly->coeff[loop_x][loop_y];
-            ySum *= y;
+            if (myPoly->mask[loop_x][loop_y] != 0) {
+                polySum += ySum * myPoly->coeff[loop_x][loop_y];
+                ySum *= y;
+            }
         }
         xSum *= x;
@@ -1159 +1170 @@
             zSum = ySum;
             for (loop_z = 0; loop_z < myPoly->nZ; loop_z++) {
-                polySum += zSum * myPoly->coeff[loop_x][loop_y][loop_z];
-                zSum *= z;
+                if (myPoly->mask[loop_x][loop_y][loop_z] != 0) {
+                    polySum += zSum * myPoly->coeff[loop_x][loop_y][loop_z];
+                    zSum *= z;
+                }
             }
             ySum *= y;
@@ -1258 +1271 @@
                 zSum = ySum;
                 for (loop_z = 0; loop_z < myPoly->nZ; loop_z++) {
-                    polySum += zSum * myPoly->coeff[loop_w][loop_x][loop_y][loop_z];
-                    zSum *= z;
+                    if (myPoly->mask[loop_w][loop_x][loop_y][loop_z] != 0) {
+                        polySum += zSum * myPoly->coeff[loop_w][loop_x][loop_y][loop_z];
+                        zSum *= z;
+                    }
                 }
                 ySum *= y;