Changeset 2343

Timestamp:

Nov 12, 2004, 9:50:34 AM (22 years ago)

Author:

gusciora

Message:

Added error codes, and corrected the return values in the polynomial
evaluation functions when the polynomial has an incorrect type.

The error stuff does not compile.

Location:

trunk/psLib/src

Files:

• dataManip/psDataManipErrors.dat (modified) (1 diff)
• dataManip/psDataManipErrors.h (modified) (2 diffs)
• dataManip/psFunctions.c (modified) (9 diffs)
• dataManip/psStats.c (modified) (3 diffs)
• math/psPolynomial.c (modified) (9 diffs)
• math/psSpline.c (modified) (9 diffs)
• math/psStats.c (modified) (3 diffs)

trunk/psLib/src/dataManip/psDataManipErrors.dat

@@ -27 +27 @@
 psStats_STATS_SAMPLE_MEDIAN_SORT_PROBLEM            Failed to sort input data.
 psStats_STATS_VECTOR_BIN_DISECT_PROBLEM         Failed to determine the bin number of a data element.
+psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT Failed to fit a 1-dimensional polynomial to the three specified data points.  Returning NAN.
+psStats_STATS_POLY_MEDIAN_OUT_OF_RANGE The requested y-value does not fall with the specified range of x-values.  Returning NAN.
 #
 psFunctions_INVALID_POLYNOMIAL_TYPE    Unknown polynomial type 0x%x found.  Evaluation failed.

trunk/psLib/src/dataManip/psDataManipErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-11 20:13:57 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-12 19:50:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
 #define PS_ERRORTEXT_psStats_STATS_SAMPLE_MEDIAN_SORT_PROBLEM "Failed to sort input data."
 #define PS_ERRORTEXT_psStats_STATS_VECTOR_BIN_DISECT_PROBLEM "Failed to determine the bin number of a data element."
+#define PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT "Failed to fit a 1-dimensional polynomial to the three specified data points.  Returning NAN."
+#define PS_ERRORTEXT_psStats_STATS_POLY_MEDIAN_OUT_OF_RANGE "The requested y-value does not fall with the specified range of x-values.  Returning NAN."
 #define PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE "Unknown polynomial type 0x%x found.  Evaluation failed."
 #define PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED "Input psVector type, %s, is not supported."

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-11 19:32:20 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-12 19:50:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1169 +1169 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1207 +1207 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1260 +1260 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1324 +1324 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1564 +1564 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1603 +1603 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1657 +1657 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1721 +1721 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 

trunk/psLib/src/dataManip/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-12 19:36:07 $
+ *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-12 19:50:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -992 +992 @@
                        float getThisValue)
 {
+    PS_POLY_CHECK_NULL(myPoly, NAN);
     PS_FLOAT_COMPARE(rangeLow, rangeHigh, NAN);
+    // We ensure that the requested f(y) value, which is getThisValue, is
+    // falls within the range of y-values of the polynomial "myPoly" in the
+    // specified x-range (rangeLow:rangeHigh).
+    float fLo = psPolynomial1DEval(rangeLow, myPoly);
+    float fHi = psPolynomial1DEval(rangeHigh, myPoly);
+    if (!((fLo <= getThisValue) && (fHi >= getThisValue))) {
+        psError(PS_ERR_UNKNOWN,
+                true,
+                psStats_STATS_POLY_MEDIAN_OUT_OF_RANGE);
+        return(NAN);
+    }
+
     psS32 numIterations = 0;
     float midpoint = 0.0;
@@ -1073 +1086 @@
         // Determine the coefficients of the polynomial.
         myPoly = psVectorFitPolynomial1D(myPoly, x, y, yErr);
+        if (myPoly == NULL) {
+            psError(PS_ERR_UNEXPECTED_NULL,
+                    false,
+                    psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT);
+            return(NAN);
+        }
         // Call p_ps1DPolyMedian(), which does a binary search on the
         // polynomial, looking for the value x such that f(x) = yVal

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-11 19:32:20 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-12 19:50:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1169 +1169 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1207 +1207 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1260 +1260 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1324 +1324 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1564 +1564 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1603 +1603 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1657 +1657 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1721 +1721 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-11 19:32:20 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-12 19:50:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1169 +1169 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1207 +1207 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1260 +1260 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1324 +1324 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1564 +1564 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1603 +1603 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1657 +1657 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 
@@ -1721 +1721 @@
                 myPoly->type);
     }
-    return(0.0);
+    return(NAN);
 }
 

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-12 19:36:07 $
+ *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-12 19:50:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -992 +992 @@
                        float getThisValue)
 {
+    PS_POLY_CHECK_NULL(myPoly, NAN);
     PS_FLOAT_COMPARE(rangeLow, rangeHigh, NAN);
+    // We ensure that the requested f(y) value, which is getThisValue, is
+    // falls within the range of y-values of the polynomial "myPoly" in the
+    // specified x-range (rangeLow:rangeHigh).
+    float fLo = psPolynomial1DEval(rangeLow, myPoly);
+    float fHi = psPolynomial1DEval(rangeHigh, myPoly);
+    if (!((fLo <= getThisValue) && (fHi >= getThisValue))) {
+        psError(PS_ERR_UNKNOWN,
+                true,
+                psStats_STATS_POLY_MEDIAN_OUT_OF_RANGE);
+        return(NAN);
+    }
+
     psS32 numIterations = 0;
     float midpoint = 0.0;
@@ -1073 +1086 @@
         // Determine the coefficients of the polynomial.
         myPoly = psVectorFitPolynomial1D(myPoly, x, y, yErr);
+        if (myPoly == NULL) {
+            psError(PS_ERR_UNEXPECTED_NULL,
+                    false,
+                    psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT);
+            return(NAN);
+        }
         // Call p_ps1DPolyMedian(), which does a binary search on the
         // polynomial, looking for the value x such that f(x) = yVal