Changeset 2267

Timestamp:

Nov 2, 2004, 9:08:33 AM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• dataManip/psMinimize.c (modified) (5 diffs)
• math/psMinimize.c (modified) (5 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-02 03:57:21 $
+ *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-02 19:08:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1467 +1467 @@
 XXX: The SDR is silent about data types.  F32 is implemented here.
  
-XXX: Define constants for default dummy number of iterations and tolerance.
- 
 XXX: Check for F32 types?
  *****************************************************************************/
@@ -1521 +1519 @@
 
     // 1: Set v[i] to be the unit vectors for each dimension in params
-
     psArray *v = psArrayAlloc(numDims);
     for (i=0;i<numDims;i++) {
@@ -1536 +1533 @@
     // 2: Set Q to be the initial params (P in the ADD)
     for (i=0;i<numDims;i++) {
-        if (myParamMask->data.U8[i] == 0) {
-            Q->data.F32[i] = params->data.F32[i];
-        }
+        Q->data.F32[i] = params->data.F32[i];
     }
 
@@ -1560 +1555 @@
                 dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS;
                 dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
-                mul = p_psLineMin(&dummyMin, Q, ((psVector *) v->data[i]), myParamMask, coords, func);
+                mul = p_psLineMin(&dummyMin,
+                                  Q,
+                                  ((psVector *) v->data[i]),
+                                  myParamMask,
+                                  coords,
+                                  func);
                 if (isnan(mul)) {
                     psError(__func__, "Could not perform line minimization (1).\n");

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-02 03:57:21 $
+ *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-02 19:08:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1467 +1467 @@
 XXX: The SDR is silent about data types.  F32 is implemented here.
  
-XXX: Define constants for default dummy number of iterations and tolerance.
- 
 XXX: Check for F32 types?
  *****************************************************************************/
@@ -1521 +1519 @@
 
     // 1: Set v[i] to be the unit vectors for each dimension in params
-
     psArray *v = psArrayAlloc(numDims);
     for (i=0;i<numDims;i++) {
@@ -1536 +1533 @@
     // 2: Set Q to be the initial params (P in the ADD)
     for (i=0;i<numDims;i++) {
-        if (myParamMask->data.U8[i] == 0) {
-            Q->data.F32[i] = params->data.F32[i];
-        }
+        Q->data.F32[i] = params->data.F32[i];
     }
 
@@ -1560 +1555 @@
                 dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS;
                 dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
-                mul = p_psLineMin(&dummyMin, Q, ((psVector *) v->data[i]), myParamMask, coords, func);
+                mul = p_psLineMin(&dummyMin,
+                                  Q,
+                                  ((psVector *) v->data[i]),
+                                  myParamMask,
+                                  coords,
+                                  func);
                 if (isnan(mul)) {
                     psError(__func__, "Could not perform line minimization (1).\n");