Changeset 6322 for trunk/psLib/src/math/psMinimizePowell.c

Timestamp:

Feb 3, 2006, 12:05:22 PM (20 years ago)

Author:

gusciora

Message:

Misc code cleaning

File:

• trunk/psLib/src/math/psMinimizePowell.c (modified) (9 diffs)

trunk/psLib/src/math/psMinimizePowell.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-23 22:25:31 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-03 22:05:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
- *
- *  XXX: must follow coding name standards on local functions.
- *  XXX: put local functions in front.
  *
  */
@@ -69 +66 @@
 /*****************************************************************************/
 /* GLOBAL VARIABLES                                                          */
-/* XXX: Do these conform to code standard?         */
 /*****************************************************************************/
 static psMinimizeChi2PowellFunc Chi2PowellFunc = NULL;
-static psVector *myValue;
-static psVector *myError;
+static psVector *PowellValue;
+static psVector *PowellError;
 /*****************************************************************************/
 /* FILE STATIC VARIABLES                                                     */
@@ -97 +93 @@
 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
@@ -104 +99 @@
 direction.
  
-XXX: 
-This is F32 only.  Must add 
-F64 support (actually, make the defaults F64,
+XXX: This is F32 only.  Must add F64 support (actually, make the defaults F64,
 and convert F32 vectors to F64).
  
-XXX: 
-output bracket vector should be an input as well.
+XXX: output bracket vector should be an input as well.
 *****************************************************************************/
 psVector *p_psDetermineBracket(
@@ -355 +347 @@
  *****************************************************************************/
 #define PS_LINEMIN_MAX_ITERATIONS 30
-psF32 p_psLineMin(psMinimization *min,
-                  psVector *params,
-                  psVector *line,
-                  const psVector *paramMask,
-                  const psArray *coords,
-                  psMinimizePowellFunc func)
+psF32 p_psLineMin(
+    psMinimization *min,
+    psVector *params,
+    psVector *line,
+    const psVector *paramMask,
+    const psArray *coords,
+    psMinimizePowellFunc func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NAN);
@@ -502 +495 @@
 #define PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE 0.01
 
-bool psMinimizePowell(psMinimization *min,
-                      psVector *params,
-                      const psVector *paramMask,
-                      const psArray *coords,
-                      psMinimizePowellFunc func)
+bool psMinimizePowell(
+    psMinimization *min,
+    psVector *params,
+    const psVector *paramMask,
+    const psArray *coords,
+    psMinimizePowellFunc func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -696 +690 @@
 This functions uses global variables to receive the function pointer, the
 data values, and the data errors.
+ 
 XXX: This is F32 only.  Must implement F64.
  *****************************************************************************/
-static psF32 myPowellChi2Func(const psVector *params,
-                              const psArray *coords)
+static psF32 myPowellChi2Func(
+    const psVector *params,
+    const psArray *coords)
 {
     psTrace(__func__, 4, "---- myPowellChi2Func() begin ----\n");
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
     PS_ASSERT_VECTOR_NON_EMPTY(params, NAN);
-    PS_ASSERT_VECTOR_NON_NULL(myValue, NAN);
-    PS_ASSERT_VECTOR_NON_EMPTY(myValue, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(PowellValue, NAN);
+    PS_ASSERT_VECTOR_NON_EMPTY(PowellValue, NAN);
     PS_ASSERT_PTR_NON_NULL(coords, NAN);
 
@@ -714 +710 @@
 
     tmp = Chi2PowellFunc(params, coords);
-    if (myError == NULL) {
+    if (PowellError == NULL) {
         for (i=0;i<coords->n;i++) {
-            d = (tmp->data.F32[i] - myValue->data.F32[i]);
+            d = (tmp->data.F32[i] - PowellValue->data.F32[i]);
             chi2+= d * d;
         }
     } else {
         for (i=0;i<coords->n;i++) {
-            d = (tmp->data.F32[i] - myValue->data.F32[i]) / myError->data.F32[i];
+            d = (tmp->data.F32[i] - PowellValue->data.F32[i]) / PowellError->data.F32[i];
             chi2+= d * d;
         }
@@ -741 +737 @@
 psMinimizePowell().
  *****************************************************************************/
-bool psMinimizeChi2Powell(psMinimization *min,
-                          psVector *params,
-                          const psVector *paramMask,
-                          const psArray *coords,
-                          const psVector *value,
-                          const psVector *error,
-                          psMinimizeChi2PowellFunc model)
+bool psMinimizeChi2Powell(
+    psMinimization *min,
+    psVector *params,
+    const psVector *paramMask,
+    const psArray *coords,
+    const psVector *value,
+    const psVector *error,
+    psMinimizeChi2PowellFunc model)
 {
-    myValue = (psVector *) value;
-    myError = (psVector *) error;
+    PowellValue = (psVector *) value;
+    PowellError = (psVector *) error;
 
     Chi2PowellFunc = model;