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

Timestamp:

Oct 27, 2004, 11:42:21 AM (22 years ago)

Author:

gusciora

Message:

Type-checking for psMinimize.c parameters.

File:

• trunk/psLib/src/math/psMinimize.c (modified) (9 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:32:49 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 21:42:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -173 +173 @@
                          float X)
 {
+    PS_PTR_CHECK_NULL(spline, NAN);
+    PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN);
+    PS_PTR_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);
+
     psS32 n;
     psS32 klo;
@@ -238 +247 @@
                                 const psVector* restrict yErr)     ///< Errors in coordinates, or NULL
 {
+    PS_PTR_CHECK_NULL(mySpline, NULL);
+    PS_INT_CHECK_NON_NEGATIVE(mySpline->n, NULL);
+    PS_VECTOR_CHECK_NULL(x, NULL);
+    PS_VECTOR_CHECK_NULL(y, NULL);
+    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+
     psTrace(".psLib.dataManip.psVectorFitSpline1D", 4,
             "---- psVectorFitSpline1D() begin ----\n");
@@ -252 +267 @@
     static psVector *yErr32Static = NULL;
 
-    PS_PTR_CHECK_NULL(mySpline, NULL);
-    PS_PTR_CHECK_NULL(y, NULL);
-    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     PS_VECTOR_CONVERT_F64_TO_F32_STATIC(y, y32, y32Static);
 
@@ -432 +444 @@
     PS_VECTOR_CHECK_EMPTY(y, NULL);
     PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
+    PS_PTR_CHECK_NULL(func, NULL);
+
     if (paramMask != NULL) {
         PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
@@ -853 +867 @@
                                         const psVector* restrict 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);
+
     psS32 i;
     psPolynomial1D *tmpPoly;
-    PS_POLY_CHECK_NULL(myPoly, NULL);
-    PS_VECTOR_CHECK_NULL(y, NULL);
-    PS_VECTOR_CHECK_EMPTY(y, NULL);
     psVector *x64 = NULL;
     psVector *y64 = NULL;
@@ -865 +882 @@
     static psVector *yErr64Static = NULL;
 
-    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     PS_VECTOR_CONVERT_F32_TO_F64_STATIC(y, y64, y64Static);
-
     // If yErr==NULL, set all errors equal.
     if (yErr == NULL) {
@@ -911 +926 @@
                                     float tol)
 {
+    PS_INT_CHECK_NON_NEGATIVE(maxIter, NULL);
+
     psMinimization *min = psAlloc(sizeof(psMinimization));
     min->maxIter = maxIter;
@@ -1319 +1336 @@
                         psMinimizePowellFunc func)
 {
+    PS_PTR_CHECK_NULL(min, NULL);
     PS_VECTOR_CHECK_NULL(params, NULL);
     PS_VECTOR_CHECK_EMPTY(params, NULL);
-    PS_PTR_CHECK_NULL(min, NULL);
+    PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NULL);
     PS_PTR_CHECK_NULL(coords, NULL);
     PS_PTR_CHECK_NULL(func, NULL);