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

Timestamp:

Jan 17, 2005, 12:17:29 PM (22 years ago)

Author:

desonia

Message:

changed psMatrixLUD to create the perm parameter according to the machine
size of 'size_t', which is used by GSL.

File:

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

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-14 23:27:56 $
+ *  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-17 22:17:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -294 +294 @@
         This can not be implemented until SDR states what order spline should be
         created.
-     
+
         Should we error if mySPline is not NULL?
     */
@@ -616 +616 @@
     psS32 p;
     psVector *beta = psVectorAlloc(numParams, PS_TYPE_F64);
-    psVector *perm = psVectorAlloc(numParams, PS_TYPE_F64);
+    psVector *perm = NULL;
 
     psVector *paramDeltasF64 = psVectorAlloc(numParams, PS_TYPE_F64);
@@ -738 +738 @@
         // XXX: How do we know if these functions were successful?
         //
-        aOut = psMatrixLUD(aOut, perm, A);
+        aOut = psMatrixLUD(aOut, &perm, A);
         paramDeltasF64 = psMatrixLUSolve(paramDeltasF64, aOut, beta, perm);
 
@@ -936 +936 @@
     coeffs = psVectorAlloc(polyOrder, PS_TYPE_F64);
     X = psVectorAlloc(x->n, PS_TYPE_F64);
-    outPerm = psVectorAlloc(polyOrder, PS_TYPE_F64);
     xSums = psVectorAlloc(1 + 2 * polyOrder, PS_TYPE_F64);
 
@@ -943 +942 @@
         B->data.F64[i] = 0.0;
         coeffs->data.F64[i] = 0.0;
-        outPerm->data.F64[i] = 0.0;
         for (j = 0; j < polyOrder; j++) {
             A->data.F64[i][j] = 0.0;
@@ -987 +985 @@
 
     // XXX: How do we know if these routines were successful?
-    ALUD = psMatrixLUD(ALUD, outPerm, A);
+    ALUD = psMatrixLUD(ALUD, &outPerm, A);
     coeffs = psMatrixLUSolve(coeffs, ALUD, B, outPerm);
 
@@ -1139 +1137 @@
 Algorithm:
  
-XXX completely ad hoc:  
+XXX completely ad hoc:
 start with the user-supplied starting parameter and
 call that b.  Calculate a/c as a fractional amount smaller/larger than b.
 Repeat this process until a local minimum is found.
  
-XXX:  
-new algorithm:  
+XXX:
+new algorithm:
 start at x=0, expand in one direction until the function
 decreases.  Then you have two points in the bracket.  Keep going until it
@@ -1151 +1149 @@
 direction.
  
-XXX: 
+XXX:
 This is F32 only.
  
-XXX: 
+XXX:
 output bracket vector should be an input as well.
 *****************************************************************************/