Changeset 1964 for trunk/psLib/src/math/psMinimize.c

Timestamp:

Oct 5, 2004, 1:14:15 PM (22 years ago)

Author:

gusciora

Message:

Improved the CHECK macros in psConstants.h.

File:

• trunk/psLib/src/math/psMinimize.c (modified) (11 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-05 22:47:21 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-05 23:14:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
 }
 
-/******************************************************************************
-VectorNormalizeGen(): this routine returns a psVector with "x" elements.  The
-values of the vector will be scaled uniformly between -1.0 and 1.0.
- 
-XXX: use a static vector.
-*****************************************************************************/
-psVector* VectorNormalizeGen(int x)
-{
-    int i = 0;
-    psVector *tmp = NULL;
-
-    tmp = psVectorAlloc(x, PS_TYPE_F32);
-    for (i = 0; i < x; i++) {
-        tmp->data.F32[i] = (((float)2 * i) / ((float)x)) - 1.0;
-    }
-
-    return (tmp);
-}
-
 /*****************************************************************************
 CalculateSecondDerivs(): Given a set of x/y vectors corresponding to a
@@ -107 +88 @@
 here defined to be 0.0.  They can be modified via ypo and yp1.
  
+This routine assumes that vectors x and y are of the appropriate types/sizes
+(F32).
+ 
 XXX: This algorithm is derived from the Numerical Recipes.
-XXX: use recyvled vectors for internal data.
+XXX: use recycled vectors for internal data.
+XXX: do an F64 version?
  *****************************************************************************/
 float *CalculateSecondDerivs(const psVector* restrict x,        ///< Ordinates (or NULL to just use the indices)
@@ -179 +164 @@
 evalSpline() which computes the interpolated value based on the cubic spline
 polynomials which are stored in psSpline1D.
+ 
+XXX: check types/sizes
+XXX: This is F32 only
  *****************************************************************************/
 float p_psNRSpline1DEval(psSpline1D *spline,
@@ -236 +224 @@
  
 XXX: usage of yErr is not specified in IfA documentation.
-XXX: Must do: if yErr==NULL, set all errors equal.
- 
 XXX: Is the x argument redundant?  What do we do if the x argument is
- supplied, but does not equal the domains specified in mySpline?
- 
+supplied, but does not equal the domains specified in mySpline?
 XXX: can psSpline be NULL?
- 
-XXX: Implemented in F32 only, must add F64.
  *****************************************************************************/
 psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline,              ///< The spline which will be generated.
@@ -655 +638 @@
 coefficients of that polynomial.
  
-XXX: 
-yErr is currently ignored.
- 
-XXX: 
-Use private name?
+XXX: yErr is currently ignored.
+ 
+XXX: Use private name?
 *****************************************************************************/
 psPolynomial1D *p_psVectorFitPolynomial1DCheby(psPolynomial1D* myPoly,
@@ -737 +718 @@
  
 XXX: Use private name?
+XXX: Use recycled vectors.
  *****************************************************************************/
 psPolynomial1D* p_psVectorFitPolynomial1DOrd(psPolynomial1D* myPoly,
@@ -761 +743 @@
     // printf("(x, y, yErr) is (%f, %f, %f)\n", x->data.F64[i], y->data.F64[i], yErr->data.F64[i]);
     // }
-
-    // XXX: Some of these are redundant.
-    PS_CHECK_NULL_1DPOLY(myPoly);
-    PS_CHECK_NULL_VECTOR(y);
-    PS_CHECK_EMPTY_VECTOR(y);
-    PS_CHECK_EMPTY_VECTOR(x);
-    PS_CHECK_NULL_VECTOR(yErr);
-    PS_CHECK_EMPTY_VECTOR(yErr);
-    PS_CHECK_VECTOR_SIZE_EQUAL(x, y);
-    PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr);
 
     A = psImageAlloc(polyOrder, polyOrder, PS_TYPE_F64);
@@ -949 +921 @@
 increases, or x is too large.  If thst does not work, expand in the other
 direction.
+ 
+XXX: This is F32 only
  *****************************************************************************/
 psVector *p_psDetermineBracket(psVector *params,
@@ -1128 +1102 @@
 XXX: This routine is not very efficient in terms of total evaluations of the
 function.
+XXX: This is F32 only
  *****************************************************************************/
 float p_psLineMin(psMinimization *min,
@@ -1501 +1476 @@
 This functions uses global variables to receive the function pointer, the
 data values, and the data errors.
+XXX: This is F32 only
  *****************************************************************************/
 float myPowellChi2Func(const psVector *params,