Changeset 6768 for trunk/psLib/src/math/psSpline.c

Timestamp:

Apr 4, 2006, 10:47:25 AM (20 years ago)

Author:

gusciora

Message:

....

File:

• trunk/psLib/src/math/psSpline.c (modified) (5 diffs)

trunk/psLib/src/math/psSpline.c

@@ -1 +1 @@
 /** @file psSpline.c
 *
-*  @brief Contains basic spline allocation, deallocation, fitting,
+*  @brief Contains basic spline allocation, deallocation, fitting, 
 *         and evaluation routines.
 *
 *  This file contains the routines that allocate, free, and evaluate splines.
 *
-*  @version $Revision: 1.137 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-24 23:43:15 $
+*  @version $Revision: 1.138 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-04 20:47:25 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -239 +239 @@
             for (psS32 i = 0 ; i < x->n ; i++) {
                 spline->knots->data.F32[i] = x->data.F32[i];
-                spline->knots->n++;
             }
         } else if (x->type.type == PS_TYPE_F64) {
             for (psS32 i = 0 ; i < x->n ; i++) {
                 spline->knots->data.F32[i] = (psF32) x->data.F64[i];
-                spline->knots->n++;
             }
         }
@@ -250 +248 @@
         for (psS32 i = 0 ; i < y->n ; i++) {
             spline->knots->data.F32[i] = (psF32) i;
-            spline->knots->n++;
         }
     }
@@ -369 +366 @@
 
     psS32 n = spline->n;
-    if ((x < spline->knots->data.F32[0]) || (x > spline->knots->data.F32[n-1])) {
+    if ((x < spline->knots->data.F32[0]) || (x > spline->knots->data.F32[spline->knots->n-1])) {
         // If x is outside the range of spline->knots, generate a warning
         // message, then return the left, or right, endpoint.
@@ -415 +412 @@
         for (psS32 i=0;i<x->n;i++) {
             tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
-            tmpVector->n++;
         }
     } else if (x->type.type == PS_TYPE_F64) {
         for (psS32 i=0;i<x->n;i++) {
             tmpVector->data.F32[i] = psSpline1DEval(spline, (psF32) x->data.F64[i]);
-            tmpVector->n++;
         }
     }