Changeset 4528 for trunk/psLib/src/dataManip/psMinimize.c

Timestamp:

Jul 8, 2005, 4:11:01 PM (21 years ago)

Author:

drobbin

Message:

updated fxns to match psLib SDRS rev. 15

File:

• trunk/psLib/src/dataManip/psMinimize.c (modified) (8 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-20 22:42:30 $
+ *  @version $Revision: 1.124 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-09 02:11:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1357 +1357 @@
 XXX: type F32 is done via vector conversion only.
  *****************************************************************************/
-psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly,
+psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* poly,
                                         const psVector* x,
                                         const psVector* y,
                                         const psVector* yErr)
 {
-    PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL);
+    PS_ASSERT_POLY_NON_NULL(poly, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(poly->n, NULL);
     PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
@@ -1389 +1389 @@
     if (x == NULL) {
         PS_VECTOR_GEN_X_INDEX_STATIC_F64(x64Static, y->n);
-        if (myPoly->type == PS_POLYNOMIAL_CHEB) {
+        if (poly->type == PS_POLYNOMIAL_CHEB) {
             p_psNormalizeVectorRangeF64(x64Static, -1.0, 1.0);
         }
@@ -1396 +1396 @@
         PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
         PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static);
-        if (myPoly->type == PS_POLYNOMIAL_CHEB) {
+        if (poly->type == PS_POLYNOMIAL_CHEB) {
             p_psNormalizeVectorRangeF64(x64, -1.0, 1.0);
         }
@@ -1405 +1405 @@
     // Call the appropriate vector fitting routine.
     psPolynomial1D *rc = NULL;
-    if (myPoly->type == PS_POLYNOMIAL_CHEB) {
-        rc = vectorFitPolynomial1DCheby(myPoly, x64, y64, yErr64);
-    } else if (myPoly->type == PS_POLYNOMIAL_ORD) {
-        rc = vectorFitPolynomial1DOrd(myPoly, x64, y64, yErr64);
+    if (poly->type == PS_POLYNOMIAL_CHEB) {
+        rc = vectorFitPolynomial1DCheby(poly, x64, y64, yErr64);
+    } else if (poly->type == PS_POLYNOMIAL_ORD) {
+        rc = vectorFitPolynomial1DOrd(poly, x64, y64, yErr64);
     } else {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
@@ -1419 +1419 @@
     }
 
-    return(myPoly);
+    return(poly);
 }
 
@@ -1432 +1432 @@
 
     psMinimization *min = psAlloc(sizeof(psMinimization));
-    min->maxIter = maxIter;
-    min->tol = tol;
+    *(int*)&min->maxIter = maxIter;
+    *(float*)&min->tol = tol;
     min->value = 0.0;
     min->iter = 0;
@@ -1993 +1993 @@
         for (i=0;i<numDims;i++) {
             if (myParamMask->data.U8[i] == 0) {
-                dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS;
-                dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
+                *(int*)&dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS;
+                *(float*)&dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
                 mul = p_psLineMin(&dummyMin,
                                   Q,