Changeset 1985 for trunk/psLib/src/dataManip/psFunctions.c

Timestamp:

Oct 6, 2004, 12:27:06 PM (22 years ago)

Author:

gusciora

Message:

Added F64 version of spline eval tests.

File:

• trunk/psLib/src/dataManip/psFunctions.c (modified) (4 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-06 21:30:53 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-06 22:27:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2065 +2065 @@
  
 XXX: SDR is silent about data types.  PS_TYPE_F32 is implemented.
+ 
+XXX: The spline eval functions require input and output to be F32.  however
+     the spline fit functions require F32 and F64.
  *****************************************************************************/
 float psSpline1DEval(const psSpline1D *spline,
@@ -2090 +2093 @@
 }
 
+// XXX: The spline eval functions require input and output to be F32.
+// however the spline fit functions require F32 and F64.
 psVector *psSpline1DEvalVector(const psVector *x,
                                const psSpline1D *spline)
@@ -2097 +2102 @@
 
     tmpVector = psVectorAlloc(x->n, PS_TYPE_F32);
-    for (i=0;i<x->n;i++) {
-        tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
+    if (x->type.type == PS_TYPE_F32) {
+        for (i=0;i<x->n;i++) {
+            tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
+        }
+    } else if (x->type.type == PS_TYPE_F64) {
+        for (i=0;i<x->n;i++) {
+            tmpVector->data.F32[i] = psSpline1DEval(spline, (float) x->data.F64[i]);
+        }
+    } else {
+        psError(__func__, "Unknown data type.\n");
+        return(NULL);
     }