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

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

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

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-03 03:30:30 $
+ *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:04:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -291 +291 @@
 
     if (y32->n != (1 + mySpline->n)) {
-        psError(__func__, "data size / spline size mismatch (%d %d)\n",
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "data size / spline size mismatch (%d %d)\n",
                 y32->n, mySpline->n);
         return(NULL);
@@ -318 +319 @@
     // Check if these are cubic splines (n==4).  If not, psError.
     if (4 != (mySpline->spline[0])->n) {
-        psError(__func__, "Don't know how to generate %d-order splines.",
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Don't know how to generate %d-order splines.",
                 (mySpline->spline[0])->n-1);
         return(NULL);
@@ -952 +954 @@
         PS_VECTOR_GEN_X_INDEX_STATIC_F64(x64Static, y->n);
         if (myPoly->type == PS_POLYNOMIAL_CHEB) {
-            p_psNormalizeVectorRange(x64Static, -1.0, 1.0);
+            psNormalizeVectorRange(x64Static, -1.0, 1.0);
         }
         x64 = x64Static;
@@ -968 +970 @@
         tmpPoly = VectorFitPolynomial1DOrd(myPoly, x64, y64, yErr64);
     } else {
-        psError(__func__, "unknown polynomial type.\n");
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "unknown polynomial type.\n");
         return(NULL);
     }
@@ -1365 +1368 @@
     bracket = p_psDetermineBracket2(params, line, paramMask, coords, func);
     if (bracket == NULL) {
-        psError(__func__, "(1) Could not bracket minimum.");
+        psError(PS_ERR_UNKNOWN, false,
+                "Could not bracket minimum.");
         return(NAN);
     }
@@ -1552 +1556 @@
                                   func);
                 if (isnan(mul)) {
-                    psError(__func__, "Could not perform line minimization (1).\n");
+                    psError(PS_ERR_UNKNOWN, false,
+                            "Could not perform line minimization");
                     psFree(v);
                     return(false);
@@ -1592 +1597 @@
         mul = p_psLineMin(&dummyMin, params, u, myParamMask, coords, func);
         if (isnan(mul)) {
-            psError(__func__, "Could not perform line minimization. (2)\n");
+            psError(PS_ERR_UNKNOWN, false,
+                    "Could not perform line minimization.");
             psFree(v);
             return(false);