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

Timestamp:

Oct 27, 2004, 10:07:17 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) (9 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 19:58:54 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:07:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252 +252 @@
     static psVector *yErr32Static = NULL;
 
-    PS_CHECK_NULL_PTR(mySpline, NULL);
-    PS_CHECK_NULL_PTR(y, NULL);
-    VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+    PS_PTR_CHECK_NULL(mySpline, NULL);
+    PS_PTR_CHECK_NULL(y, NULL);
+    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     CONVERT_VECTOR_F64_TO_F32(y, y32, y32Static);
 
@@ -262 +262 @@
         yErr32 = yErr32Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
         CONVERT_VECTOR_F64_TO_F32(yErr, yErr32, yErr32Static);
     }
@@ -271 +271 @@
         x32 = x32Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
         CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
     }
@@ -425 +425 @@
                         psMinimizeLMChi2Func func)
 {
-    PS_CHECK_NULL_PTR(min, NULL);
+    PS_PTR_CHECK_NULL(min, NULL);
     PS_CHECK_NULL_VECTOR(params, NULL);
     PS_CHECK_EMPTY_VECTOR(params, NULL);
-    PS_CHECK_NULL_PTR(x, NULL);
+    PS_PTR_CHECK_NULL(x, NULL);
     PS_CHECK_NULL_VECTOR(y, NULL);
     PS_CHECK_EMPTY_VECTOR(y, NULL);
@@ -865 +865 @@
     static psVector *yErr64Static = NULL;
 
-    VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     CONVERT_VECTOR_F32_TO_F64(y, y64, y64Static);
 
@@ -873 +873 @@
         yErr64 = yErr64Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
         CONVERT_VECTOR_F32_TO_F64(yErr, yErr64, yErr64Static);
     }
@@ -885 +885 @@
         x64 = x64Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
@@ -1321 +1321 @@
     PS_CHECK_NULL_VECTOR(params, NULL);
     PS_CHECK_EMPTY_VECTOR(params, NULL);
-    PS_CHECK_NULL_PTR(min, NULL);
-    PS_CHECK_NULL_PTR(coords, NULL);
-    PS_CHECK_NULL_PTR(func, NULL);
+    PS_PTR_CHECK_NULL(min, NULL);
+    PS_PTR_CHECK_NULL(coords, NULL);
+    PS_PTR_CHECK_NULL(func, NULL);
 
     psS32 numDims = params->n;