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

Timestamp:

Oct 9, 2007, 9:24:46 AM (19 years ago)

Author:

eugene

Message:

changed mask to coeffMask, define PS_POLY_MASK_FIT,SET

File:

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

trunk/psLib/src/math/psPolynomial.h

@@ -8 +8 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-09 01:40:07 $
+ * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-10-09 19:24:46 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #include "psVector.h"
 #include "psScalar.h"
+
+typedef enum {
+    PS_POLY_MASK_NONE = 0,
+    PS_POLY_MASK_SET  = 1, // the coefficient should not be used (implies MASK_FIT)
+    PS_POLY_MASK_FIT  = 2, // the coefficient should not be fitted 
+    PS_POLY_MASK_BOTH = 3, // the coefficient should not be fitted 
+} psPolynomialMaskValues;
 
 /** Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -60 +67 @@
     psF64 *coeff;                       ///< Coefficients
     psF64 *coeffErr;                    ///< Error in coefficients
-    psMaskType *mask;                   ///< Coefficient mask
+    psMaskType *coeffMask;              ///< Coefficient mask
 }
 psPolynomial1D;
@@ -72 +79 @@
     psF64 **coeff;                      ///< Coefficients
     psF64 **coeffErr;                   ///< Error in coefficients
-    psMaskType **mask;                  ///< Coefficients mask
+    psMaskType **coeffMask;                  ///< Coefficients mask
 }
 psPolynomial2D;
@@ -85 +92 @@
     psF64 ***coeff;                     ///< Coefficients
     psF64 ***coeffErr;                  ///< Error in coefficients
-    psMaskType ***mask;                 ///< Coefficients mask
+    psMaskType ***coeffMask;                 ///< Coefficients mask
 }
 psPolynomial3D;
@@ -93 +100 @@
 {
     psPolynomialType type;              ///< Polynomial type
-    unsigned int nX;            ///< Polynomial order in x
-    unsigned int nY;            ///< Polynomial order in y
-    unsigned int nZ;            ///< Polynomial order in z
-    unsigned int nT;            ///< Polynomial order in t
+    unsigned int nX;                    ///< Polynomial order in x
+    unsigned int nY;                    ///< Polynomial order in y
+    unsigned int nZ;                    ///< Polynomial order in z
+    unsigned int nT;                    ///< Polynomial order in t
     psF64 ****coeff;                    ///< Coefficients
     psF64 ****coeffErr;                 ///< Error in coefficients
-    psMaskType ****mask;                ///< Coefficients mask
+    psMaskType ****coeffMask;           ///< Coefficients mask
 }
 psPolynomial4D;