Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 3095) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 3096) @@ -7,6 +7,6 @@ * 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,5 +92,5 @@ psFree(tmpSpline->p_psDeriv2); } - psFree(tmpSpline->domains); + psFree(tmpSpline->knots); return; @@ -1833,10 +1833,10 @@ // 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,14 +1867,14 @@ 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;idomains)[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,8 +1909,8 @@ tmp->p_psDeriv2 = NULL; - tmp->domains = (psF32 *) psAlloc((bounds->n) * sizeof(psF32)); + tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32); for (i=0;in;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,5 +2136,5 @@ 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,15 +2155,16 @@ 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)); Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 3095) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 3096) @@ -12,6 +12,6 @@ * @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,8 +394,9 @@ 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; Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 3095) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 3096) @@ -9,6 +9,6 @@ * @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,5 +171,5 @@ 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,5 +189,5 @@ 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,7 +196,7 @@ } 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,5 +236,5 @@ 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,7 +314,7 @@ for (i=0;in;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; Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 3095) +++ /trunk/psLib/src/math/psMinimize.c (revision 3096) @@ -9,6 +9,6 @@ * @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,5 +171,5 @@ 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,5 +189,5 @@ 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,7 +196,7 @@ } 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,5 +236,5 @@ 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,7 +314,7 @@ for (i=0;in;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; Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 3095) +++ /trunk/psLib/src/math/psPolynomial.c (revision 3096) @@ -7,6 +7,6 @@ * 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,5 +92,5 @@ psFree(tmpSpline->p_psDeriv2); } - psFree(tmpSpline->domains); + psFree(tmpSpline->knots); return; @@ -1833,10 +1833,10 @@ // 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,14 +1867,14 @@ 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;idomains)[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,8 +1909,8 @@ tmp->p_psDeriv2 = NULL; - tmp->domains = (psF32 *) psAlloc((bounds->n) * sizeof(psF32)); + tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32); for (i=0;in;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,5 +2136,5 @@ 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,15 +2155,16 @@ 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)); Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 3095) +++ /trunk/psLib/src/math/psPolynomial.h (revision 3096) @@ -12,6 +12,6 @@ * @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,8 +394,9 @@ 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; Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 3095) +++ /trunk/psLib/src/math/psSpline.c (revision 3096) @@ -7,6 +7,6 @@ * 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,5 +92,5 @@ psFree(tmpSpline->p_psDeriv2); } - psFree(tmpSpline->domains); + psFree(tmpSpline->knots); return; @@ -1833,10 +1833,10 @@ // 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,14 +1867,14 @@ 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;idomains)[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,8 +1909,8 @@ tmp->p_psDeriv2 = NULL; - tmp->domains = (psF32 *) psAlloc((bounds->n) * sizeof(psF32)); + tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32); for (i=0;in;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,5 +2136,5 @@ 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,15 +2155,16 @@ 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)); Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 3095) +++ /trunk/psLib/src/math/psSpline.h (revision 3096) @@ -12,6 +12,6 @@ * @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,8 +394,9 @@ 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; Index: /trunk/psLib/test/dataManip/tst_psFunc02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 3095) +++ /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 3096) @@ -56,11 +56,12 @@ } - 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;idomains[%d] is %f\n", i, tmpSpline->domains[i]); + printf("psSpline1D->knots->data.F32[%d] is %f\n", i, + tmpSpline->knots->data.F32[i]); } @@ -137,11 +138,12 @@ } - 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;idomains[%d] is %f\n", i, tmpSpline->domains[i]); + printf("psSpline1D->knots->data.F32[%d] is %f\n", i, + tmpSpline->knots->data.F32[i]); } @@ -191,11 +193,12 @@ } - 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;idomains[%d] is %f\n", i, tmpSpline->domains[i]); + printf("psSpline1D->data.F32[%d] is %f\n", i, + tmpSpline->knots->data.F32[i]); } @@ -272,11 +275,12 @@ } - 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;idomains[%d] is %f\n", i, tmpSpline->domains[i]); + printf("psSpline1D->knots->data.F32[%d] is %f\n", i, + tmpSpline->knots->data.F32[i]); } @@ -331,11 +335,12 @@ } - 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;idomains[%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); Index: /trunk/psLib/test/dataManip/tst_psFunc03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 3095) +++ /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 3096) @@ -61,12 +61,13 @@ } - 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;idomains[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,12 +122,13 @@ } - 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;idomains[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]); } } Index: /trunk/psLib/test/dataManip/tst_psFunc04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 3095) +++ /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 3096) @@ -40,5 +40,5 @@ for (i=0;idata.F32[i] = tmpSpline->domains[i]; + data->data.F32[i] = tmpSpline->knots->data.F32[i]; } psVectorFitSpline1D(tmpSpline, data, data, NULL); @@ -95,5 +95,5 @@ for (i=0;idata.F32[i] = tmpSpline->domains[i]; + data->data.F32[i] = tmpSpline->knots->data.F32[i]; } psVectorFitSpline1D(tmpSpline, data, data, NULL); Index: /trunk/psLib/test/dataManip/tst_psFunc05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 3095) +++ /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 3096) @@ -41,5 +41,5 @@ for (i=0;idata.F32[i] = tmpSpline->domains[i]; + data->data.F32[i] = tmpSpline->knots->data.F32[i]; } Index: /trunk/psLib/test/dataManip/tst_psFunc07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 3095) +++ /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 3096) @@ -54,5 +54,5 @@ for (i=0;idata.F32[i] = tmpSpline->domains[i]; + x->data.F32[i] = tmpSpline->knots->data.F32[i]; y->data.F32[i] = myFunc(x->data.F32[i]); } @@ -126,5 +126,5 @@ for (i=0;idata.F64[i] = tmpSpline->domains[i]; + x->data.F64[i] = tmpSpline->knots->data.F32[i]; y->data.F64[i] = myFunc(x->data.F64[i]); }