Changeset 5090 for trunk/psLib/src/math/psPolynomial.h

Timestamp:

Sep 21, 2005, 4:47:16 PM (21 years ago)

Author:

gusciora

Message:

The nX terms for the polynomials now refer to the order, not the number
of terms.

File:

• trunk/psLib/src/math/psPolynomial.h (modified) (2 diffs)

trunk/psLib/src/math/psPolynomial.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-19 19:53:13 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-22 02:47:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
  */
 typedef enum {
-    PS_POLYNOMIAL_ORD,                 ///< Ordinary Polynomial
-    PS_POLYNOMIAL_CHEB                 ///< Chebyshev Polynomial
+    PS_POLYNOMIAL_ORD,                  ///< Ordinary Polynomial
+    PS_POLYNOMIAL_CHEB                  ///< Chebyshev Polynomial
 }
 psPolynomialType;
 
+// XXX: These are incorrect names for the order of the polynomial.  We
+// keep them here temporarily so we can later sed replace them with the
+// correct names.
 /** One-dimensional polynomial */
 typedef struct
 {
-    psPolynomialType type;             ///< Polynomial type
-    unsigned int n;                    ///< Number of terms
-    psF64 *coeff;                      ///< Coefficients
-    psF64 *coeffErr;                   ///< Error in coefficients
-    psMaskType *mask;                  ///< Coefficient mask
+    psPolynomialType type;              ///< Polynomial type
+    unsigned int COOL_1D_n;             ///< Polynomial order
+    psF64 *coeff;                       ///< Coefficients
+    psF64 *coeffErr;                    ///< Error in coefficients
+    psMaskType *mask;                   ///< Coefficient mask
 }
 psPolynomial1D;
 
+// XXX: These are incorrect names for the order of the polynomial.  We
+// keep them here temporarily so we can later sed replace them with the
+// correct names.
 /** Two-dimensional polynomial */
 typedef struct
 {
-    psPolynomialType type;             ///< Polynomial type
-    unsigned int nX;                   ///< Number of terms in x
-    unsigned int nY;                   ///< Number of terms in y
-    psF64 **coeff;                     ///< Coefficients
-    psF64 **coeffErr;                  ///< Error in coefficients
-    psMaskType **mask;                 ///< Coefficients mask
+    psPolynomialType type;              ///< Polynomial type
+    unsigned int COOL_2D_nX;            ///< Polynomial order in x
+    unsigned int COOL_2D_nY;            ///< Polynomial order in y
+    psF64 **coeff;                      ///< Coefficients
+    psF64 **coeffErr;                   ///< Error in coefficients
+    psMaskType **mask;                  ///< Coefficients mask
 }
 psPolynomial2D;
 
+// XXX: These are incorrect names for the order of the polynomial.  We
+// keep them here temporarily so we can later sed replace them with the
+// correct names.
 /** Three-dimensional polynomial */
 typedef struct
 {
-    psPolynomialType type;             ///< Polynomial type
-    unsigned int nX;                   ///< Number of terms in x
-    unsigned int nY;                   ///< Number of terms in y
-    unsigned int nZ;                   ///< Number of terms in z
-    psF64 ***coeff;                    ///< Coefficients
-    psF64 ***coeffErr;                 ///< Error in coefficients
-    psMaskType ***mask;                ///< Coefficients mask
+    psPolynomialType type;              ///< Polynomial type
+    unsigned int COOL_3D_nX;            ///< Polynomial order in x
+    unsigned int COOL_3D_nY;            ///< Polynomial order in y
+    unsigned int COOL_3D_nZ;            ///< Polynomial order in z
+    psF64 ***coeff;                     ///< Coefficients
+    psF64 ***coeffErr;                  ///< Error in coefficients
+    psMaskType ***mask;                 ///< Coefficients mask
 }
 psPolynomial3D;
 
+// XXX: These are incorrect names for the order of the polynomial.  We
+// keep them here temporarily so we can later sed replace them with the
+// correct names.
 /** Four-dimensional polynomial */
 typedef struct
 {
-    psPolynomialType type;             ///< Polynomial type
-    unsigned int nX;                   ///< Number of terms in x
-    unsigned int nY;                   ///< Number of terms in y
-    unsigned int nZ;                   ///< Number of terms in z
-    unsigned int nT;                   ///< Number of terms in t
-    psF64 ****coeff;                   ///< Coefficients
-    psF64 ****coeffErr;                ///< Error in coefficients
-    psMaskType ****mask;               ///< Coefficients mask
+    psPolynomialType type;              ///< Polynomial type
+    unsigned int COOL_4D_nX;            ///< Polynomial order in x
+    unsigned int COOL_4D_nY;            ///< Polynomial order in y
+    unsigned int COOL_4D_nZ;            ///< Polynomial order in z
+    unsigned int COOL_4D_nT;            ///< Polynomial order in t
+    psF64 ****coeff;                    ///< Coefficients
+    psF64 ****coeffErr;                 ///< Error in coefficients
+    psMaskType ****mask;                ///< Coefficients mask
 }
 psPolynomial4D;