Changeset 3096

Timestamp:

Jan 26, 2005, 10:41:04 AM (21 years ago)

Author:

gusciora

Message:

Substituted knots for domains in the spline structs.

Location:

trunk/psLib

Files:

• src/dataManip/psFunctions.c (modified) (7 diffs)
• src/dataManip/psFunctions.h (modified) (2 diffs)
• src/dataManip/psMinimize.c (modified) (6 diffs)
• src/math/psMinimize.c (modified) (6 diffs)
• src/math/psPolynomial.c (modified) (7 diffs)
• src/math/psPolynomial.h (modified) (2 diffs)
• src/math/psSpline.c (modified) (7 diffs)
• src/math/psSpline.h (modified) (2 diffs)
• test/dataManip/tst_psFunc02.c (modified) (5 diffs)
• test/dataManip/tst_psFunc03.c (modified) (2 diffs)
• test/dataManip/tst_psFunc04.c (modified) (2 diffs)
• test/dataManip/tst_psFunc05.c (modified) (1 diff)
• test/dataManip/tst_psFunc07.c (modified) (2 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-17 23:25:09 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-26 20:41:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
         psFree(tmpSpline->p_psDeriv2);
     }
-    psFree(tmpSpline->domains);
+    psFree(tmpSpline->knots);
 
     return;
@@ -1833 +1833 @@
 //    psPolynomial1D **spline;
 //    psF32 *p_psDeriv2;
-//    psF32 *domains;
+//    psVector *knots;
 //} psSpline1D;
 
 /*****************************************************************************
     NOTE: "n" specifies the number of spline polynomials.  Therefore, there
-    must exist n+1 points in "domains".
+    must exist n+1 points in "knots".
  
 XXX: Ensure that domain[i+1] != domain[i]
@@ -1867 +1867 @@
     tmp->p_psDeriv2 = NULL;
 
-    tmp->domains = (psF32 *) psAlloc((numSplines+1) * sizeof(psF32));
+    tmp->knots = psVectorAlloc(numSplines+1, PS_TYPE_F32);
     width = (max - min) / ((psF32) numSplines);
 
-    (tmp->domains)[0] = min;
+    tmp->knots->data.F32[0] = min;
     tmpDomain = min+width;
     for (i=1;i<numSplines+1;i++) {
-        (tmp->domains)[i] = tmpDomain;
+        tmp->knots->data.F32[i] = tmpDomain;
         tmpDomain+= width;
     }
-    (tmp->domains)[numSplines] = max;
+    tmp->knots->data.F32[numSplines] = max;
 
     p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
@@ -1909 +1909 @@
     tmp->p_psDeriv2 = NULL;
 
-    tmp->domains = (psF32 *) psAlloc((bounds->n) * sizeof(psF32));
+    tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32);
 
     for (i=0;i<bounds->n;i++) {
-        (tmp->domains)[i] = bounds->data.F32[i];
+        tmp->knots->data.F32[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
             if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
@@ -2136 +2136 @@
 psSpline1DEval(): this routine takes an existing spline of arbitrary order
 and an independent x value.  Each determines which spline that x corresponds
-to by doing a bracket disection on the domains of the spline data structure
+to by doing a bracket disection on the knots of the spline data structure
 (vectorBinDisectF32()).  Then it evaluates the spline at that x location
 by a call to the 1D polynomial functions.
@@ -2155 +2155 @@
 
     n = spline->n;
-    binNum = vectorBinDisectF32(spline->domains, (spline->n)+1, x);
+    //XXX    binNum = vectorBinDisectF32(spline->domains, (spline->n)+1, x);
+    binNum = vectorBinDisectF32(spline->knots->data.F32, (spline->n)+1, x);
     if (binNum < 0) {
         psLogMsg(__func__, PS_LOG_WARN,
                  "psSpline1DEval(): x ordinate (%f) is outside the spline range (%f - %f).",
-                 x, (spline->domains)[0],
-                 (spline->domains)[n-1]);
-
-        if (x < (spline->domains)[0]) {
+                 x, spline->knots->data.F32[0],
+                 spline->knots->data.F32[n-1]);
+
+        if (x < spline->knots->data.F32[0]) {
             return(psPolynomial1DEval(spline->spline[0],
                                       x));
-        } else if (x > (spline->domains)[n-1]) {
+        } else if (x > spline->knots->data.F32[n-1]) {
             return(psPolynomial1DEval(spline->spline[n-1],
                                       x));

trunk/psLib/src/dataManip/psFunctions.h

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-29 22:15:51 $
+*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-26 20:41:04 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -394 +394 @@
 typedef struct
 {
-    psS32 n;                        ///< The number of spline polynomials
-    psPolynomial1D **spline;      ///< An array of n pointers to the spline polynomials
-    psF32 *p_psDeriv2;            ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
-    psF32 *domains;               ///< The boundaries between each spline piece.  Size is n+1.
+    psS32 n;                       ///< The number of spline polynomials
+    psPolynomial1D **spline;       ///< An array of n pointers to the spline polynomials
+    psF32 *p_psDeriv2;             ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
+    psF32 *domains;                ///< The boundaries between each spline piece.  Size is n+1.
+    psVector *knots;               ///< The boundaries between each spline piece.  Size is n+1.
 }
 psSpline1D;

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-17 23:25:09 $
+ *  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-26 20:41:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -171 +171 @@
     PS_PTR_CHECK_NULL(spline, NAN);
     PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN);
-    PS_PTR_CHECK_NULL(spline->domains, NAN);
+    PS_VECTOR_CHECK_NULL(spline->domains, NAN);
     PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN);
     PS_VECTOR_CHECK_NULL(x, NAN);
@@ -189 +189 @@
  
     n = spline->n;
-    klo = p_psVectorBinDisect32(spline->domains, (spline->n)+1, X);
+    klo = p_psVectorBinDisect32(spline->knots->data.F32, (spline->n)+1, X);
     if (klo < 0) {
         psLogMsg(__func__, PS_LOG_WARN,
@@ -196 +196 @@
     }
     khi = klo + 1;
-    H = (spline->domains)[khi] - (spline->domains)[klo];
-    A = ((spline->domains)[khi] - X) / H;
-    B = (X - (spline->domains)[klo]) / H;
+    H = spline->knots->data.F32[khi] - spline->knots->data.F32[klo];
+    A = (spline->knots->data.F32[khi] - X) / H;
+    B = (X - spline->knots->data.F32[klo]) / H;
     C = ((A*A*A)-A) * (H*H/6.0);
     D = ((B*B*B)-B) * (H*H/6.0);
@@ -236 +236 @@
  
 XXX: Is the x argument redundant?  What do we do if the x argument is
-supplied, but does not equal the domains specified in mySpline?
+supplied, but does not equal the knots specified in mySpline?
  
 XXX: can psSpline be NULL?
@@ -314 +314 @@
         for (i=0;i<mySpline->n;i++) {
             slope = (y32->data.F32[i+1] - y32->data.F32[i]) /
-                    (mySpline->domains[i+1] - mySpline->domains[i]);
+                    (mySpline->knots->data.F32[i+1] - mySpline->knots->data.F32[i]);
             (mySpline->spline[i])->coeff[0] = y32->data.F32[i] -
-                                              (slope * mySpline->domains[i]);
+                                              (slope * mySpline->knots->data.F32[i]);
 
             (mySpline->spline[i])->coeff[1] = slope;

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-17 23:25:09 $
+ *  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-26 20:41:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -171 +171 @@
     PS_PTR_CHECK_NULL(spline, NAN);
     PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN);
-    PS_PTR_CHECK_NULL(spline->domains, NAN);
+    PS_VECTOR_CHECK_NULL(spline->domains, NAN);
     PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN);
     PS_VECTOR_CHECK_NULL(x, NAN);
@@ -189 +189 @@
  
     n = spline->n;
-    klo = p_psVectorBinDisect32(spline->domains, (spline->n)+1, X);
+    klo = p_psVectorBinDisect32(spline->knots->data.F32, (spline->n)+1, X);
     if (klo < 0) {
         psLogMsg(__func__, PS_LOG_WARN,
@@ -196 +196 @@
     }
     khi = klo + 1;
-    H = (spline->domains)[khi] - (spline->domains)[klo];
-    A = ((spline->domains)[khi] - X) / H;
-    B = (X - (spline->domains)[klo]) / H;
+    H = spline->knots->data.F32[khi] - spline->knots->data.F32[klo];
+    A = (spline->knots->data.F32[khi] - X) / H;
+    B = (X - spline->knots->data.F32[klo]) / H;
     C = ((A*A*A)-A) * (H*H/6.0);
     D = ((B*B*B)-B) * (H*H/6.0);
@@ -236 +236 @@
  
 XXX: Is the x argument redundant?  What do we do if the x argument is
-supplied, but does not equal the domains specified in mySpline?
+supplied, but does not equal the knots specified in mySpline?
  
 XXX: can psSpline be NULL?
@@ -314 +314 @@
         for (i=0;i<mySpline->n;i++) {
             slope = (y32->data.F32[i+1] - y32->data.F32[i]) /
-                    (mySpline->domains[i+1] - mySpline->domains[i]);
+                    (mySpline->knots->data.F32[i+1] - mySpline->knots->data.F32[i]);
             (mySpline->spline[i])->coeff[0] = y32->data.F32[i] -
-                                              (slope * mySpline->domains[i]);
+                                              (slope * mySpline->knots->data.F32[i]);
 
             (mySpline->spline[i])->coeff[1] = slope;

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-17 23:25:09 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-26 20:41:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
         psFree(tmpSpline->p_psDeriv2);
     }
-    psFree(tmpSpline->domains);
+    psFree(tmpSpline->knots);
 
     return;
@@ -1833 +1833 @@
 //    psPolynomial1D **spline;
 //    psF32 *p_psDeriv2;
-//    psF32 *domains;
+//    psVector *knots;
 //} psSpline1D;
 
 /*****************************************************************************
     NOTE: "n" specifies the number of spline polynomials.  Therefore, there
-    must exist n+1 points in "domains".
+    must exist n+1 points in "knots".
  
 XXX: Ensure that domain[i+1] != domain[i]
@@ -1867 +1867 @@
     tmp->p_psDeriv2 = NULL;
 
-    tmp->domains = (psF32 *) psAlloc((numSplines+1) * sizeof(psF32));
+    tmp->knots = psVectorAlloc(numSplines+1, PS_TYPE_F32);
     width = (max - min) / ((psF32) numSplines);
 
-    (tmp->domains)[0] = min;
+    tmp->knots->data.F32[0] = min;
     tmpDomain = min+width;
     for (i=1;i<numSplines+1;i++) {
-        (tmp->domains)[i] = tmpDomain;
+        tmp->knots->data.F32[i] = tmpDomain;
         tmpDomain+= width;
     }
-    (tmp->domains)[numSplines] = max;
+    tmp->knots->data.F32[numSplines] = max;
 
     p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
@@ -1909 +1909 @@
     tmp->p_psDeriv2 = NULL;
 
-    tmp->domains = (psF32 *) psAlloc((bounds->n) * sizeof(psF32));
+    tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32);
 
     for (i=0;i<bounds->n;i++) {
-        (tmp->domains)[i] = bounds->data.F32[i];
+        tmp->knots->data.F32[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
             if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
@@ -2136 +2136 @@
 psSpline1DEval(): this routine takes an existing spline of arbitrary order
 and an independent x value.  Each determines which spline that x corresponds
-to by doing a bracket disection on the domains of the spline data structure
+to by doing a bracket disection on the knots of the spline data structure
 (vectorBinDisectF32()).  Then it evaluates the spline at that x location
 by a call to the 1D polynomial functions.
@@ -2155 +2155 @@
 
     n = spline->n;
-    binNum = vectorBinDisectF32(spline->domains, (spline->n)+1, x);
+    //XXX    binNum = vectorBinDisectF32(spline->domains, (spline->n)+1, x);
+    binNum = vectorBinDisectF32(spline->knots->data.F32, (spline->n)+1, x);
     if (binNum < 0) {
         psLogMsg(__func__, PS_LOG_WARN,
                  "psSpline1DEval(): x ordinate (%f) is outside the spline range (%f - %f).",
-                 x, (spline->domains)[0],
-                 (spline->domains)[n-1]);
-
-        if (x < (spline->domains)[0]) {
+                 x, spline->knots->data.F32[0],
+                 spline->knots->data.F32[n-1]);
+
+        if (x < spline->knots->data.F32[0]) {
             return(psPolynomial1DEval(spline->spline[0],
                                       x));
-        } else if (x > (spline->domains)[n-1]) {
+        } else if (x > spline->knots->data.F32[n-1]) {
             return(psPolynomial1DEval(spline->spline[n-1],
                                       x));

trunk/psLib/src/math/psPolynomial.h

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-29 22:15:51 $
+*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-26 20:41:04 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -394 +394 @@
 typedef struct
 {
-    psS32 n;                        ///< The number of spline polynomials
-    psPolynomial1D **spline;      ///< An array of n pointers to the spline polynomials
-    psF32 *p_psDeriv2;            ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
-    psF32 *domains;               ///< The boundaries between each spline piece.  Size is n+1.
+    psS32 n;                       ///< The number of spline polynomials
+    psPolynomial1D **spline;       ///< An array of n pointers to the spline polynomials
+    psF32 *p_psDeriv2;             ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
+    psF32 *domains;                ///< The boundaries between each spline piece.  Size is n+1.
+    psVector *knots;               ///< The boundaries between each spline piece.  Size is n+1.
 }
 psSpline1D;

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-17 23:25:09 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-26 20:41:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
         psFree(tmpSpline->p_psDeriv2);
     }
-    psFree(tmpSpline->domains);
+    psFree(tmpSpline->knots);
 
     return;
@@ -1833 +1833 @@
 //    psPolynomial1D **spline;
 //    psF32 *p_psDeriv2;
-//    psF32 *domains;
+//    psVector *knots;
 //} psSpline1D;
 
 /*****************************************************************************
     NOTE: "n" specifies the number of spline polynomials.  Therefore, there
-    must exist n+1 points in "domains".
+    must exist n+1 points in "knots".
  
 XXX: Ensure that domain[i+1] != domain[i]
@@ -1867 +1867 @@
     tmp->p_psDeriv2 = NULL;
 
-    tmp->domains = (psF32 *) psAlloc((numSplines+1) * sizeof(psF32));
+    tmp->knots = psVectorAlloc(numSplines+1, PS_TYPE_F32);
     width = (max - min) / ((psF32) numSplines);
 
-    (tmp->domains)[0] = min;
+    tmp->knots->data.F32[0] = min;
     tmpDomain = min+width;
     for (i=1;i<numSplines+1;i++) {
-        (tmp->domains)[i] = tmpDomain;
+        tmp->knots->data.F32[i] = tmpDomain;
         tmpDomain+= width;
     }
-    (tmp->domains)[numSplines] = max;
+    tmp->knots->data.F32[numSplines] = max;
 
     p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
@@ -1909 +1909 @@
     tmp->p_psDeriv2 = NULL;
 
-    tmp->domains = (psF32 *) psAlloc((bounds->n) * sizeof(psF32));
+    tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32);
 
     for (i=0;i<bounds->n;i++) {
-        (tmp->domains)[i] = bounds->data.F32[i];
+        tmp->knots->data.F32[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
             if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
@@ -2136 +2136 @@
 psSpline1DEval(): this routine takes an existing spline of arbitrary order
 and an independent x value.  Each determines which spline that x corresponds
-to by doing a bracket disection on the domains of the spline data structure
+to by doing a bracket disection on the knots of the spline data structure
 (vectorBinDisectF32()).  Then it evaluates the spline at that x location
 by a call to the 1D polynomial functions.
@@ -2155 +2155 @@
 
     n = spline->n;
-    binNum = vectorBinDisectF32(spline->domains, (spline->n)+1, x);
+    //XXX    binNum = vectorBinDisectF32(spline->domains, (spline->n)+1, x);
+    binNum = vectorBinDisectF32(spline->knots->data.F32, (spline->n)+1, x);
     if (binNum < 0) {
         psLogMsg(__func__, PS_LOG_WARN,
                  "psSpline1DEval(): x ordinate (%f) is outside the spline range (%f - %f).",
-                 x, (spline->domains)[0],
-                 (spline->domains)[n-1]);
-
-        if (x < (spline->domains)[0]) {
+                 x, spline->knots->data.F32[0],
+                 spline->knots->data.F32[n-1]);
+
+        if (x < spline->knots->data.F32[0]) {
             return(psPolynomial1DEval(spline->spline[0],
                                       x));
-        } else if (x > (spline->domains)[n-1]) {
+        } else if (x > spline->knots->data.F32[n-1]) {
             return(psPolynomial1DEval(spline->spline[n-1],
                                       x));

trunk/psLib/src/math/psSpline.h

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-29 22:15:51 $
+*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-26 20:41:04 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -394 +394 @@
 typedef struct
 {
-    psS32 n;                        ///< The number of spline polynomials
-    psPolynomial1D **spline;      ///< An array of n pointers to the spline polynomials
-    psF32 *p_psDeriv2;            ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
-    psF32 *domains;               ///< The boundaries between each spline piece.  Size is n+1.
+    psS32 n;                       ///< The number of spline polynomials
+    psPolynomial1D **spline;       ///< An array of n pointers to the spline polynomials
+    psF32 *p_psDeriv2;             ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
+    psF32 *domains;                ///< The boundaries between each spline piece.  Size is n+1.
+    psVector *knots;               ///< The boundaries between each spline piece.  Size is n+1.
 }
 psSpline1D;

trunk/psLib/test/dataManip/tst_psFunc02.c

@@ -56 +56 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
+               tmpSpline->knots->data.F32[i]);
     }
 
@@ -137 +138 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
+               tmpSpline->knots->data.F32[i]);
     }
 
@@ -191 +193 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        printf("psSpline1D->data.F32[%d] is %f\n", i,
+               tmpSpline->knots->data.F32[i]);
     }
 
@@ -272 +275 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
+               tmpSpline->knots->data.F32[i]);
     }
 
@@ -331 +335 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
+               tmpSpline->knots->data.F32[i]);
     }
     psFree(bounds);

trunk/psLib/test/dataManip/tst_psFunc03.c

@@ -61 +61 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        if (tmpSpline->domains[i] != bounds->data.F32[i]) {
-            printf("ERROR: psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        if (tmpSpline->knots->data.F32[i] != bounds->data.F32[i]) {
+            printf("ERROR: psSpline1D->knots->data.F32[%d] is %f\n", i,
+                   tmpSpline->knots->data.F32[i]);
         }
     }
@@ -121 +122 @@
     }
 
-    if (tmpSpline->domains == NULL) {
-        printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
+    if (tmpSpline->knots == NULL) {
+        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
         testStatus = false;
     }
 
     for (i=0;i<N+1;i++) {
-        if (tmpSpline->domains[i] != bounds->data.F32[i]) {
-            printf("ERROR: psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
+        if (tmpSpline->knots->data.F32[i] != bounds->data.F32[i]) {
+            printf("ERROR: psSpline1D->knots->data.F32[%d] is %f\n", i,
+                   tmpSpline->knots->data.F32[i]);
         }
     }

trunk/psLib/test/dataManip/tst_psFunc04.c

@@ -40 +40 @@
 
     for (i=0;i<N+1;i++) {
-        data->data.F32[i] = tmpSpline->domains[i];
+        data->data.F32[i] = tmpSpline->knots->data.F32[i];
     }
     psVectorFitSpline1D(tmpSpline, data, data, NULL);
@@ -95 +95 @@
 
     for (i=0;i<N+1;i++) {
-        data->data.F32[i] = tmpSpline->domains[i];
+        data->data.F32[i] = tmpSpline->knots->data.F32[i];
     }
     psVectorFitSpline1D(tmpSpline, data, data, NULL);

trunk/psLib/test/dataManip/tst_psFunc05.c

@@ -41 +41 @@
 
     for (i=0;i<N+1;i++) {
-        data->data.F32[i] = tmpSpline->domains[i];
+        data->data.F32[i] = tmpSpline->knots->data.F32[i];
     }
 

trunk/psLib/test/dataManip/tst_psFunc07.c

@@ -54 +54 @@
 
     for (i=0;i<NUM_SPLINES+1;i++) {
-        x->data.F32[i] = tmpSpline->domains[i];
+        x->data.F32[i] = tmpSpline->knots->data.F32[i];
         y->data.F32[i] = myFunc(x->data.F32[i]);
     }
@@ -126 +126 @@
 
     for (i=0;i<NUM_SPLINES+1;i++) {
-        x->data.F64[i] = tmpSpline->domains[i];
+        x->data.F64[i] = tmpSpline->knots->data.F32[i];
         y->data.F64[i] = myFunc(x->data.F64[i]);
     }