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

Timestamp:

Oct 27, 2004, 10:11:47 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/math/psMinimize.c (modified) (7 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -274 +274 @@
         CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
 
     if (y32->n != (1 + mySpline->n)) {
@@ -426 +426 @@
 {
     PS_PTR_CHECK_NULL(min, NULL);
-    PS_CHECK_NULL_VECTOR(params, NULL);
-    PS_CHECK_EMPTY_VECTOR(params, NULL);
+    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(x, NULL);
-    PS_CHECK_NULL_VECTOR(y, NULL);
-    PS_CHECK_EMPTY_VECTOR(y, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
+    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_EMPTY(y, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
     if (paramMask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
     }
     if (yErr != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
     }
 
@@ -856 +856 @@
     psPolynomial1D *tmpPoly;
     PS_CHECK_NULL_POLY(myPoly, NULL);
-    PS_CHECK_NULL_VECTOR(y, NULL);
-    PS_CHECK_EMPTY_VECTOR(y, NULL);
+    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_EMPTY(y, NULL);
     psVector *x64 = NULL;
     psVector *y64 = NULL;
@@ -888 +888 @@
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
 
     // Call the appropriate vector fitting routine.
@@ -1319 +1319 @@
                         psMinimizePowellFunc func)
 {
-    PS_CHECK_NULL_VECTOR(params, NULL);
-    PS_CHECK_EMPTY_VECTOR(params, NULL);
+    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(min, NULL);
     PS_PTR_CHECK_NULL(coords, NULL);
@@ -1363 +1363 @@
         myParamMask = (psVector *) paramMask;
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(params, myParamMask, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
 
     // 1: Set v[i] to be the unit vectors for each dimension in params