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

Timestamp:

Oct 27, 2004, 10:29:12 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) (5 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:20:11 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:29:12 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -255 +255 @@
     PS_PTR_CHECK_NULL(y, NULL);
     PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
-    CONVERT_VECTOR_F64_TO_F32(y, y32, y32Static);
+    PS_VECTOR_CONVERT_F64_TO_F32_STATIC(y, y32, y32Static);
 
     // If yErr==NULL, set all errors equal.
     if (yErr == NULL) {
-        GEN_PERSIST_YERR_VEC_F32(yErr32Static, y->n);
+        PS_VECTOR_GEN_YERR_STATIC_F32(yErr32Static, y->n);
         yErr32 = yErr32Static;
     } else {
         PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
-        CONVERT_VECTOR_F64_TO_F32(yErr, yErr32, yErr32Static);
+        PS_VECTOR_CONVERT_F64_TO_F32_STATIC(yErr, yErr32, yErr32Static);
     }
 
     // If x==NULL, create an x32 vector with x values set to (0:n).
     if (x == NULL) {
-        GEN_PERSIST_X_INDEX_VEC_F32(x32Static, y->n);
+        PS_VECTOR_GEN_X_INDEX_STATIC_F32(x32Static, y->n);
         x32 = x32Static;
     } else {
         PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
-        CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
+        PS_VECTOR_CONVERT_F64_TO_F32_STATIC(x, x32, x32Static);
     }
     PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
@@ -668 +668 @@
     double fac;
     double sum;
-    GEN_STATIC_RECYCLED_VECTOR(f, n, PS_TYPE_F64);
+    PS_VECTOR_GEN_STATIC_RECYCLED(f, n, PS_TYPE_F64);
     psScalar *fScalar;
     psScalar tmpScalar;
@@ -866 +866 @@
 
     PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
-    CONVERT_VECTOR_F32_TO_F64(y, y64, y64Static);
+    PS_VECTOR_CONVERT_F32_TO_F64_STATIC(y, y64, y64Static);
 
     // If yErr==NULL, set all errors equal.
     if (yErr == NULL) {
-        GEN_PERSIST_YERR_VEC_F64(yErr64Static, y->n);
+        PS_VECTOR_GEN_YERR_STATIC_F64(yErr64Static, y->n);
         yErr64 = yErr64Static;
     } else {
         PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
-        CONVERT_VECTOR_F32_TO_F64(yErr, yErr64, yErr64Static);
+        PS_VECTOR_CONVERT_F32_TO_F64_STATIC(yErr, yErr64, yErr64Static);
     }
 
     // If x==NULL, create an x64 vector with x values set to (0:n).
     if (x == NULL) {
-        GEN_PERSIST_X_INDEX_VEC_F64(x64Static, y->n);
+        PS_VECTOR_GEN_X_INDEX_STATIC_F64(x64Static, y->n);
         if (myPoly->type == PS_POLYNOMIAL_CHEB) {
             p_psNormalizeVector(x64Static);
@@ -886 +886 @@
     } else {
         PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
-        CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
+        PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static);
     }
     PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);