Changeset 21183 for trunk/psLib/src/math/psPolynomialMD.c

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/psLib/src/math/psPolynomialMD.c (modified) (17 diffs)

trunk/psLib/src/math/psPolynomialMD.c

@@ -132 +132 @@
                               const psVector *values, // Measured values
                               const psVector *mask, // Mask for values
-                              psMaskType maskVal 
+                              psVectorMaskType maskVal 
                               )
 {
@@ -143 +143 @@
     int numGood = numValues;            // Number of good values
     for (int i = 0; i < numValues; i++) {
-        if (mask && (mask->data.U8[i] & maskVal)) {
+        if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal)) {
             numGood--;
             continue;
@@ -253 +253 @@
 
 bool psPolynomialMDFit(psPolynomialMD *poly, const psVector *values, const psVector *errors,
-                       const psVector *mask, psMaskType maskVal, const psArray *coordsArray)
+                       const psVector *mask, psVectorMaskType maskVal, const psArray *coordsArray)
 {
     PS_ASSERT_POLYNOMIALMD_NON_NULL(poly, false);
@@ -268 +268 @@
     if (mask) {
         PS_ASSERT_VECTOR_NON_NULL(mask, false);
-        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_VECTOR_MASK, false);
         PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, false);
     }
@@ -294 +294 @@
         PS_ASSERT_VECTOR_TYPE(coords, PS_TYPE_F32, false);
 
-        if (mask && (mask->data.PS_TYPE_MASK_DATA[i] & maskVal)) {
+        if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal)) {
             continue;
         }
@@ -321 +321 @@
 }
 
-// XXX this function should take a (psMaskType markVal) argument
+// XXX this function should take a (psVectorMaskType markVal) argument
 bool psPolynomialMDClipFit(psPolynomialMD *poly, const psVector *values, const psVector *errors,
-                           const psVector *mask, psMaskType maskVal, const psArray *coordsArray,
+                           const psVector *mask, psVectorMaskType maskVal, const psArray *coordsArray,
                            int numIter, float rej) 
 {
@@ -340 +340 @@
     if (mask) {
         PS_ASSERT_VECTOR_NON_NULL(mask, false);
-        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_VECTOR_MASK, false);
         PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, false);
     }
@@ -355 +355 @@
 
     // copy the input mask to a local temporary mask 
-    poly->ownMask = psVectorRecycle(poly->ownMask, numValues, PS_TYPE_U8); // Our own mask for input values
+    poly->ownMask = psVectorRecycle(poly->ownMask, numValues, PS_TYPE_VECTOR_MASK); // Our own mask for input values
     psVectorInit(poly->ownMask, 0);
     for (int i = 0; mask && (i < numValues); i++) {
-        if (mask->data.PS_TYPE_MASK_DATA[i] & maskVal) {
-            poly->ownMask->data.U8[i] = 0xff;
+        if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal) {
+            poly->ownMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 0xff;
             numGood--;
         }
@@ -392 +392 @@
                     i, values->data.F32[i], values->data.F32[i] - poly->deviations->data.F32[i], poly->deviations->data.F32[i], limit);
 
-            if (poly->ownMask->data.U8[i]) continue;
+            if (poly->ownMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) continue;
 
             if (fabs(poly->deviations->data.F32[i]) > limit) {
@@ -398 +398 @@
                         i, values->data.F32[i], values->data.F32[i] + poly->deviations->data.F32[i], 
                         poly->deviations->data.F32[i], limit);
-                poly->ownMask->data.U8[i] = 0xff;
+                poly->ownMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 0xff;
                 numClipped++;
                 numGood--;
@@ -435 +435 @@
     psVectorInit(vector, 0.0);
     for (int i = 0; i < numValues; i++) {
-        if (mask->data.U8[i]) {
+        if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
             continue;
         }
@@ -462 +462 @@
 
 bool psPolynomialMDClipFit(psPolynomialMD *poly, const psVector *values, const psVector *errors,
-                           const psVector *mask, psMaskType maskVal, const psArray *coordsArray,
+                           const psVector *mask, psVectorMaskType maskVal, const psArray *coordsArray,
                            int numIter, float rej)
 {
@@ -478 +478 @@
     if (mask) {
         PS_ASSERT_VECTOR_NON_NULL(mask, false);
-        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_VECTOR_MASK, false);
         PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, false);
     }
@@ -500 +500 @@
         PS_ASSERT_VECTOR_TYPE(coords, PS_TYPE_F32, false);
 
-        if (mask && (mask->data.PS_TYPE_MASK_DATA[i] & maskVal)) {
+        if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal)) {
             continue;
         }
@@ -516 +516 @@
     psImage *matrix = psImageAlloc(numTerms, numTerms, PS_TYPE_F64); // Least-squares matrix
     psVector *vector = psVectorAlloc(numTerms, PS_TYPE_F64); // Least-squares vector
-    psVector *ownMask = psVectorAlloc(numValues, PS_TYPE_U8); // Our own mask for input values
+    psVector *ownMask = psVectorAlloc(numValues, PS_TYPE_VECTOR_MASK); // Our own mask for input values
     psVectorInit(ownMask, 0);
     if (mask) {
         for (int i = 0; i < numValues; i++) {
-            if (mask->data.PS_TYPE_MASK_DATA[i] & maskVal) {
-                ownMask->data.U8[i] = 0xff;
+            if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal) {
+                ownMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 0xff;
                 numGood--;
             }
@@ -551 +551 @@
         float limit = rej * poly->stdevFit; // Rejection limit
         for (int i = 0; i < numValues; i++) {
-            if (ownMask->data.U8[i]) {
+            if (ownMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
                 continue;
             }
@@ -558 +558 @@
                         i, values->data.F32[i], psPolynomialMDEval(poly, coordsArray->data[i]),
                         deviations->data.F32[i], limit);
-                ownMask->data.U8[i] = 0xff;
+                ownMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 0xff;
                 numClipped++;
                 numGood--;