Changeset 2439 for trunk/psLib/src/dataManip

Timestamp:

Nov 24, 2004, 12:33:21 PM (22 years ago)

Author:

gusciora

Message:

Changed order of spline eval functions.

Location:

trunk/psLib/src/dataManip

Files:

• psFunctions.c (modified) (4 diffs)
• psFunctions.h (modified) (2 diffs)
• psMinimize.c (modified) (1 diff)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 21:59:43 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2112 +2112 @@
      the spline fit functions require F32 and F64.
  *****************************************************************************/
-float psSpline1DEval(const psSpline1D *spline,
-                     float x)
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+)
 {
     PS_PTR_CHECK_NULL(spline, NAN);
@@ -2144 +2146 @@
 // 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)
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+)
 {
     PS_PTR_CHECK_NULL(spline, NULL);
@@ -2157 +2161 @@
     if (x->type.type == PS_TYPE_F32) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         x->data.F32[i],
+                                         spline
+                                     );
         }
     } 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]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         (float) x->data.F64[i],
+                                         spline
+                                     );
         }
     } else {

trunk/psLib/src/dataManip/psFunctions.h

@@ -12 +12 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-24 21:59:43 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-24 22:33:21 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -409 +409 @@
                                    psS32 order);
 
-float psSpline1DEval(const psSpline1D *spline,
-                     float x);
-
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline);
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+);
+
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+);
 
 psS32 p_psVectorBinDisect(psVector *bins,

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 22:22:38 $
+ *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii