Changeset 21183 for trunk/psLib/src/math/psMinimizeLMM.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/psMinimizeLMM.c (modified) (10 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-02 20:49:22 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:38 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
     PS_ASSERT_VECTOR_TYPE(params,    PS_TYPE_F32,  false);
     if (paramMask) {
-        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, false);
     }
 
@@ -113 +113 @@
     // set tmpBeta values which are not masked
     for (int j = 0, n = 0; j < params->n; j++) {
-        if (paramMask && (paramMask->data.U8[j])) continue;
+        if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[j])) continue;
         tmpBeta->data.F32[j] = Beta->data.F32[n];
         n++;
@@ -120 +120 @@
     // apply Beta to get new Params values
     for (int j = 0; j < params->n; j++) {
-        if (paramMask && (paramMask->data.U8[j])) {
+        if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[j])) {
             Params->data.F32[j] = params->data.F32[j];
             continue;
@@ -140 +140 @@
     // apply tmpBeta after limits have been checked
     for (int j = 0, n = 0; j < params->n; j++) {
-        if (paramMask && (paramMask->data.U8[j])) continue;
+        if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[j])) continue;
         Beta->data.F32[n] = tmpBeta->data.F32[j];
         n++;
@@ -269 +269 @@
     PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, false);
     if (paramMask) {
-        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, false);
     }
 
@@ -297 +297 @@
         // we track alpha,beta and params,deriv separately
         for (int j = 0, J = 0; j < params->n; j++) {
-            if (paramMask && (paramMask->data.U8[j])) continue;
+            if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[j])) continue;
 
             weight = deriv->data.F32[j] * dy->data.F32[i];
 
             for (int k = 0, K = 0; k <= j; k++) {
-                if (paramMask && (paramMask->data.U8[k])) continue;
+                if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[k])) continue;
                 alpha->data.F32[J][K] += weight * deriv->data.F32[k];
                 K++;
@@ -351 +351 @@
         paramMask = constraint->paramMask;
         if (paramMask != NULL) {
-            PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, false);
+            PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, false);
             PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, false);
         }
@@ -493 +493 @@
         psImageInit (covar, 0.0);
         for (int j = 0, J = 0; j < params->n; j++) {
-            if (paramMask && (paramMask->data.U8[j])) {
+            if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[j])) {
                 covar->data.F32[j][j] = 1.0;
                 continue;
             }
             for (int k = 0, K = 0; k < params->n; k++) {
-                if (paramMask && (paramMask->data.U8[k])) continue;
+                if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[k])) continue;
                 covar->data.F32[j][k] = Alpha->data.F32[J][K];
                 K++;
@@ -535 +535 @@
         nParams = 0;
         for (int i = 0; i < paramMask->n; i++) {
-            if (paramMask->data.U8[i]) continue;
+            if (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) continue;
             nParams ++;
         }