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

trunk/psLib/src/math/psMinimizePowell.c

@@ -11 +11 @@
  *  NOTE: XXX: The SDR is silent about data types.  F32 is implemented here.
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-06 21:36:09 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:38 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 #define PS_VECTOR_ADD_MULTIPLE(BASE, BASEMASK, LINE, OUT, MUL) \
 for (psS32 i=0;i<BASE->n;i++) { \
-    if (BASEMASK->data.U8[i] == 0) { \
+    if (BASEMASK->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) { \
         OUT->data.F32[i] = BASE->data.F32[i] + (MUL * LINE->data.F32[i]); \
     } else { \
@@ -62 +62 @@
 BOOL_VAR = true; \
 for (psS32 i=0;i<IN->n;i++) { \
-    if ((INMASK->data.U8[i] == 0) && (fabs(IN->data.F32[i]) >= FLT_EPSILON)) { \
+    if ((INMASK->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) && (fabs(IN->data.F32[i]) >= FLT_EPSILON)) { \
         BOOL_VAR = false; \
         break; \
@@ -359 +359 @@
     PS_ASSERT_VECTOR_NON_NULL(paramMask, NAN);
     PS_ASSERT_VECTOR_NON_EMPTY(paramMask, NAN);
-    PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, NAN);
+    PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, NAN);
     PS_ASSERT_PTR_NON_NULL(coords, NAN);
     PS_ASSERT_PTR_NON_NULL(func, NAN);
@@ -388 +388 @@
         for (i=0;i<params->n;i++) {
             psTrace("psLib.math", 6, "(params, paramMask, line)[%d] is (%f %d %f)\n", i,
-                    params->data.F32[i], paramMask->data.U8[i], line->data.F32[i]);
+                    params->data.F32[i], paramMask->data.PS_TYPE_VECTOR_MASK_DATA[i], line->data.F32[i]);
         }
     }
@@ -527 +527 @@
 
     if (paramMask == NULL) {
-        myParamMask = psVectorAlloc(params->n, PS_TYPE_U8);
+        myParamMask = psVectorAlloc(params->n, PS_TYPE_VECTOR_MASK);
         psVectorInit(myParamMask, 0);
     } else {
@@ -572 +572 @@
         biggestIter = 0;
         for (i=0;i<numDims;i++) {
-            if (myParamMask->data.U8[i] == 0) {
+            if (myParamMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
                 P_PSMINIMIZATION_SET_MAXITER((&dummyMin),PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS);
                 *(float*)&dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
@@ -603 +603 @@
         // 4: Set the vector u = Q - P
         for (i=0;i<numDims;i++) {
-            if (myParamMask->data.U8[i] == 0) {
+            if (myParamMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
                 u->data.F32[i] = Q->data.F32[i] - params->data.F32[i];
                 u->n++;
@@ -649 +649 @@
 
         for (i=0;i<numDims;i++) {
-            if (myParamMask->data.U8[i] == 0) {
+            if (myParamMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
                 pQP->data.F32[i] = (2 * Q->data.F32[i]) - params->data.F32[i];
             } else {
@@ -663 +663 @@
         if (term1 < term2) {
             for (i=0;i<numDims;i++) {
-                if (myParamMask->data.U8[i] == 0) {
+                if (myParamMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
                     ((psVector *) v->data[biggestIter])->data.F32[i] = u->data.F32[i];
                 }
@@ -671 +671 @@
         // 7: Set P to Q
         for (i=0;i<numDims;i++) {
-            if (myParamMask->data.U8[i] == 0) {
+            if (myParamMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
                 params->data.F32[i] = Q->data.F32[i];
             }