Index: trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- trunk/psLib/src/dataManip/psMinimize.c	(revision 3990)
+++ trunk/psLib/src/dataManip/psMinimize.c	(revision 4029)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.119 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 23:57:37 $
+ *  @version $Revision: 1.120 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:26:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -174,13 +174,13 @@
                          psF32 X)
 {
-    PS_PTR_CHECK_NULL(spline, NAN);
-    PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN);
-    PS_VECTOR_CHECK_NULL(spline->domains, NAN);
-    PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN);
-    PS_VECTOR_CHECK_NULL(x, NAN);
-    PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NAN);
-    PS_VECTOR_CHECK_NULL(y, NAN);
-    PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NAN);
-    PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL);
+    PS_ASSERT_PTR_NON_NULL(spline, NAN);
+    PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(spline->domains, NAN);
+    PS_ASSERT_PTR_NON_NULL(spline->p_psDeriv2, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
+    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(y, NAN);
+    PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NAN);
+    PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL);
  
     psS32 n;
@@ -258,8 +258,8 @@
                                 const psVector* yErr)     ///< Errors in coordinates, or NULL
 {
-    PS_VECTOR_CHECK_NULL(y, NULL);
-    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
+    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
     if (mySpline != NULL) {
-        PS_VECTOR_CHECK_TYPE(mySpline->knots, PS_TYPE_F32, NULL);
+        PS_ASSERT_VECTOR_TYPE(mySpline->knots, PS_TYPE_F32, NULL);
     }
 
@@ -285,5 +285,5 @@
         yErr32 = yErr32Static;
     } else {
-        PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
+        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL);
         PS_VECTOR_CONVERT_F64_TO_F32_STATIC(yErr, yErr32, yErr32Static);
     }
@@ -294,9 +294,9 @@
         x32 = x32Static;
     } else {
-        PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
+        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
         PS_VECTOR_CONVERT_F64_TO_F32_STATIC(x, x32, x32Static);
     }
-    PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
-    PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(x32, y32, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(yErr32, y32, NULL);
 
     /*
@@ -310,6 +310,6 @@
         mySpline = psSpline1DAllocGeneric(x32, 3);
     }
-    PS_PTR_CHECK_NULL(mySpline, NULL);
-    PS_INT_CHECK_NON_NEGATIVE(mySpline->n, NULL);
+    PS_ASSERT_PTR_NON_NULL(mySpline, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(mySpline->n, NULL);
 
     if (y32->n != (1 + mySpline->n)) {
@@ -440,6 +440,6 @@
                                   const psArray *coords)
 {
-    PS_PTR_CHECK_NULL(coords, NULL);
-    PS_PTR_CHECK_NULL(params, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(params, NULL);
 
     psTrace(".psLib.dataManip.psMinimize", 4,
@@ -457,6 +457,6 @@
         deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32);
     } else {
-        PS_IMAGE_CHECK_SIZE(deriv, params->n, coords->n, NULL);
-        PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL);
+        PS_ASSERT_IMAGE_SIZE(deriv, params->n, coords->n, NULL);
+        PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL);
     }
 
@@ -513,6 +513,6 @@
                                   const psArray *coords)
 {
-    PS_PTR_CHECK_NULL(coords, NULL);
-    PS_PTR_CHECK_NULL(params, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(params, NULL);
 
     psF64 normalization = params->data.F32[0];
@@ -527,6 +527,6 @@
         deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32);
     } else {
-        PS_IMAGE_CHECK_SIZE(deriv, 6, coords->n, NULL);
-        PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL);
+        PS_ASSERT_IMAGE_SIZE(deriv, 6, coords->n, NULL);
+        PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL);
     }
 
@@ -572,12 +572,12 @@
                         psMinimizeLMChi2Func func)
 {
-    PS_PTR_CHECK_NULL(min, NULL);
-    PS_VECTOR_CHECK_NULL(params, NULL);
-    PS_VECTOR_CHECK_EMPTY(params, NULL);
-    PS_PTR_CHECK_NULL(x, NULL);
-    PS_VECTOR_CHECK_NULL(y, NULL);
-    PS_VECTOR_CHECK_EMPTY(y, NULL);
-    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
-    PS_PTR_CHECK_NULL(func, NULL);
+    PS_ASSERT_PTR_NON_NULL(min, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
+    PS_ASSERT_PTR_NON_NULL(x, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL);
+    PS_ASSERT_PTR_NON_NULL(func, NULL);
 
     // this function has test and current values for several things
@@ -923,21 +923,21 @@
                            psMinimizeLMChi2Func func)
 {
-    PS_PTR_CHECK_NULL(min, NULL);
-    PS_VECTOR_CHECK_NULL(params, NULL);
-    PS_VECTOR_CHECK_EMPTY(params, NULL);
-    PS_PTR_CHECK_NULL(x, NULL);
-    PS_VECTOR_CHECK_NULL(y, NULL);
-    PS_VECTOR_CHECK_EMPTY(y, NULL);
-    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
-    PS_PTR_CHECK_NULL(func, NULL);
+    PS_ASSERT_PTR_NON_NULL(min, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
+    PS_ASSERT_PTR_NON_NULL(x, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL);
+    PS_ASSERT_PTR_NON_NULL(func, NULL);
 
     if (paramMask != NULL) {
-        PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, NULL);
     }
     if (yErr != NULL) {
-        PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(y, yErr, NULL);
     }
     if (covar != NULL) {
-        PS_IMAGE_CHECK_SIZE(covar, params->n, params->n, NULL);
+        PS_ASSERT_IMAGE_SIZE(covar, params->n, params->n, NULL);
     }
 
@@ -1363,9 +1363,9 @@
                                         const psVector* yErr)
 {
-    PS_POLY_CHECK_NULL(myPoly, NULL);
-    PS_INT_CHECK_NON_NEGATIVE(myPoly->n, NULL);
-    PS_VECTOR_CHECK_NULL(y, NULL);
-    PS_VECTOR_CHECK_EMPTY(y, NULL);
-    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+    PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
+    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
 
     psS32 i;
@@ -1383,5 +1383,5 @@
         yErr64 = yErr64Static;
     } else {
-        PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
+        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL);
         PS_VECTOR_CONVERT_F32_TO_F64_STATIC(yErr, yErr64, yErr64Static);
     }
@@ -1395,5 +1395,5 @@
         x64 = x64Static;
     } else {
-        PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
+        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
         PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static);
         if (myPoly->type == PS_POLYNOMIAL_CHEB) {
@@ -1401,6 +1401,6 @@
         }
     }
-    PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
-    PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(x64, y64, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(yErr64, y64, NULL);
 
     // Call the appropriate vector fitting routine.
@@ -1430,5 +1430,5 @@
                                     psF32 tol)
 {
-    PS_INT_CHECK_NON_NEGATIVE(maxIter, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL);
 
     psMinimization *min = psAlloc(sizeof(psMinimization));
@@ -1765,16 +1765,16 @@
                   psMinimizePowellFunc func)
 {
-    PS_PTR_CHECK_NULL(min, NAN);
-    PS_VECTOR_CHECK_NULL(params, NAN);
-    PS_VECTOR_CHECK_EMPTY(params, NAN);
-    PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NAN);
-    PS_VECTOR_CHECK_NULL(line, NAN);
-    PS_VECTOR_CHECK_EMPTY(line, NAN);
-    PS_VECTOR_CHECK_TYPE(line, PS_TYPE_F32, NAN);
-    PS_VECTOR_CHECK_NULL(paramMask, NAN);
-    PS_VECTOR_CHECK_EMPTY(paramMask, NAN);
-    PS_VECTOR_CHECK_TYPE(paramMask, PS_TYPE_U8, NAN);
-    PS_PTR_CHECK_NULL(coords, NAN);
-    PS_PTR_CHECK_NULL(func, NAN);
+    PS_ASSERT_PTR_NON_NULL(min, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_EMPTY(params, NAN);
+    PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(line, NAN);
+    PS_ASSERT_VECTOR_NON_EMPTY(line, NAN);
+    PS_ASSERT_VECTOR_TYPE(line, PS_TYPE_F32, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(paramMask, NAN);
+    PS_ASSERT_VECTOR_NON_EMPTY(paramMask, NAN);
+    PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, NAN);
+    PS_ASSERT_PTR_NON_NULL(coords, NAN);
+    PS_ASSERT_PTR_NON_NULL(func, NAN);
     psVector *bracket;
     psF32 a = 0.0;
@@ -1919,10 +1919,10 @@
                         psMinimizePowellFunc func)
 {
-    PS_PTR_CHECK_NULL(min, NULL);
-    PS_VECTOR_CHECK_NULL(params, NULL);
-    PS_VECTOR_CHECK_EMPTY(params, NULL);
-    PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NULL);
-    PS_PTR_CHECK_NULL(coords, NULL);
-    PS_PTR_CHECK_NULL(func, NULL);
+    PS_ASSERT_PTR_NON_NULL(min, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
+    PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(func, NULL);
     psS32 numDims = params->n;
     PS_VECTOR_GEN_STATIC_RECYCLED(pQP, numDims, PS_TYPE_F32);
@@ -1957,5 +1957,5 @@
         myParamMask = (psVector *) paramMask;
     }
-    PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(params, myParamMask, NULL);
 
     // 1: Set v[i] to be the unit vectors for each dimension in params
@@ -2119,6 +2119,6 @@
                                       const psArray *coords)
 {
-    PS_PTR_CHECK_NULL(coords, NULL);
-    PS_PTR_CHECK_NULL(params, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(params, NULL);
 
     psF32 x;
@@ -2150,9 +2150,9 @@
     psTrace(".psLib.dataManip.myPowellChi2Func", 4,
             "---- myPowellChi2Func() begin ----\n");
-    PS_VECTOR_CHECK_NULL(params, NAN);
-    PS_VECTOR_CHECK_EMPTY(params, NAN);
-    PS_VECTOR_CHECK_NULL(myValue, NAN);
-    PS_VECTOR_CHECK_EMPTY(myValue, NAN);
-    PS_PTR_CHECK_NULL(coords, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_EMPTY(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(myValue, NAN);
+    PS_ASSERT_VECTOR_NON_EMPTY(myValue, NAN);
+    PS_ASSERT_PTR_NON_NULL(coords, NAN);
 
     psF32 chi2 = 0.0;