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

Timestamp:

Oct 27, 2004, 10:32:49 AM (22 years ago)

Author:

gusciora

Message:

I've been unifying the naming conventions for various macros that check
functions parameters for type, size, non-NULL ...

File:

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

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:29:12 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:32:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -114 +114 @@
 
     // XXX: The second derivatives at the endpoints, undefined in the SDR,
-    // are set in psConstants.h: LEFT_SPLINE_DERIV, RIGHT_SPLINE_DERIV.
+    // are set in psConstants.h: PS_LEFT_SPLINE_DERIV, PS_RIGHT_SPLINE_DERIV.
     derivs2[0] = -0.5;
-    u[0]= (3.0/(X[1]-X[0])) * ((Y[1]-Y[0])/(X[1]-X[0]) - LEFT_SPLINE_DERIV);
+    u[0]= (3.0/(X[1]-X[0])) * ((Y[1]-Y[0])/(X[1]-X[0]) - PS_LEFT_SPLINE_DERIV);
 
     for (i=1;i<=(n-2);i++) {
@@ -134 +134 @@
 
     qn = 0.5;
-    u[n-1] = (3.0/(X[n-1]-X[n-2])) * (RIGHT_SPLINE_DERIV - (Y[n-1]-Y[n-2])/(X[n-1]-X[n-2]));
+    u[n-1] = (3.0/(X[n-1]-X[n-2])) * (PS_RIGHT_SPLINE_DERIV - (Y[n-1]-Y[n-2])/(X[n-1]-X[n-2]));
     derivs2[n-1] = (u[n-1] - (qn * u[n-2])) / ((qn * derivs2[n-2]) + 1.0);
 
@@ -958 +958 @@
     float new_cDir = 0.0;
     psVector *bracket = psVectorAlloc(3, PS_TYPE_F32);
-    float stepSize = DETERMINE_BRACKET_STEP_SIZE;
+    float stepSize = PS_DETERMINE_BRACKET_STEP_SIZE;
     psVector *tmp = NULL;
     psS32 i = 0;