Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 6203) +++ /trunk/psLib/src/astro/psCoord.c (revision 6204) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.100 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-23 22:25:31 $ +* @version $Revision: 1.101 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -212,6 +212,6 @@ psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform)); - pt->x = psPolynomial2DAlloc(order1, order2, PS_POLYNOMIAL_ORD); - pt->y = psPolynomial2DAlloc(order1, order2, PS_POLYNOMIAL_ORD); + pt->x = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, order1, order2); + pt->y = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, order1, order2); psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree); @@ -275,6 +275,6 @@ psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort)); - pt->x = psPolynomial4DAlloc(order1, order2, order3, order4, PS_POLYNOMIAL_ORD); - pt->y = psPolynomial4DAlloc(order1, order2, order3, order4, PS_POLYNOMIAL_ORD); + pt->x = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, order1, order2, order3, order4); + pt->y = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, order1, order2, order3, order4); psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree); @@ -573,5 +573,5 @@ psTrace(__func__, 5, "out poly (nX, nY) is (%d, %d)\n", orderX, orderY); - psPolynomial2D *out = psPolynomial2DAlloc(orderX, orderY, PS_POLYNOMIAL_ORD); + psPolynomial2D *out = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, orderX, orderY); psTrace(__func__, 5, "Creating poly (%d, %d)\n", orderX, orderY); @@ -689,5 +689,5 @@ psTrace(__func__, 6, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y); // Create the constant "f(x, y) = 1" polynomial. - psPolynomial2D *currPoly = psPolynomial2DAlloc(0, 0, PS_POLYNOMIAL_ORD); + psPolynomial2D *currPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 0, 0); currPoly->coeff[0][0] = 1.0; @@ -738,5 +738,5 @@ psTrace(__func__, 5, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y); // Create the constant "f(x, y) = 1" polynomial. - psPolynomial2D *currPoly = psPolynomial2DAlloc(0, 0, PS_POLYNOMIAL_ORD); + psPolynomial2D *currPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 0, 0); currPoly->coeff[0][0] = 1.0; @@ -809,5 +809,5 @@ // // XXX: Verify this (poly order/nterm change) - psPolynomial2D *fakePoly = psPolynomial2DAlloc(order-1, order-1, PS_POLYNOMIAL_ORD); + psPolynomial2D *fakePoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, order-1, order-1); for (int i = 0; i < order; i++) { for (int j = 0; j < order; j++) { Index: /trunk/psLib/src/astro/psEarthOrientation.c =================================================================== --- /trunk/psLib/src/astro/psEarthOrientation.c (revision 6203) +++ /trunk/psLib/src/astro/psEarthOrientation.c (revision 6204) @@ -8,6 +8,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-23 20:04:31 $ + * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2005 Maui High Performance Computing Center, University of Hawaii @@ -228,9 +228,9 @@ return false; } - xPoly = psPolynomial1DAlloc(xCoeff->n, PS_POLYNOMIAL_ORD); + xPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, xCoeff->n); memcpy(xPoly->coeff, xCoeff->data.F64,PSELEMTYPE_SIZEOF(PS_TYPE_F64)*xCoeff->n); - yPoly = psPolynomial1DAlloc(yCoeff->n, PS_POLYNOMIAL_ORD); + yPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, yCoeff->n); memcpy(yPoly->coeff, yCoeff->data.F64,PSELEMTYPE_SIZEOF(PS_TYPE_F64)*yCoeff->n); - sPoly = psPolynomial1DAlloc(sCoeff->n, PS_POLYNOMIAL_ORD); + sPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, sCoeff->n); memcpy(sPoly->coeff, sCoeff->data.F64,PSELEMTYPE_SIZEOF(PS_TYPE_F64)*sCoeff->n); Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 6203) +++ /trunk/psLib/src/astro/psTime.c (revision 6204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.78 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-23 20:04:31 $ + * @version $Revision: 1.79 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1170,5 +1170,5 @@ // Interpolation of look up table - results = psLookupTableInterpolateAll(table, jd); + results = psLookupTableInterpolateAll(table, jd, NULL); // Check for successful interpolation Index: /trunk/psLib/src/math/psConstants.h =================================================================== --- /trunk/psLib/src/math/psConstants.h (revision 6203) +++ /trunk/psLib/src/math/psConstants.h (revision 6204) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.83 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-26 00:31:19 $ + * @version $Revision: 1.84 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -512,5 +512,5 @@ static psPolynomial1D *(NAME) = NULL; \ if ((NAME) == NULL) { \ - (NAME) = psPolynomial1DAlloc(ORDER, TYPE); \ + (NAME) = psPolynomial1DAlloc(TYPE, ORDER); \ p_psMemSetPersistent((NAME), true); \ p_psMemSetPersistent((NAME)->coeff, true); \ @@ -519,52 +519,56 @@ } \ -#define PS_POLY_2D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ -static psPolynomial2D *(NAME) = NULL; \ -if ((NAME) == NULL) { \ - (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \ - p_psMemSetPersistent((NAME), true); \ -} \ - -#define PS_POLY_3D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ -static psPolynomial3D *(NAME) = NULL; \ -if ((NAME) == NULL) { \ - (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \ - p_psMemSetPersistent((NAME), true); \ -} \ - -#define PS_POLY_4D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ -static psPolynomial4D *(NAME) = NULL; \ -if ((NAME) == NULL) { \ - (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \ - p_psMemSetPersistent((NAME), true); \ -} \ +/* XXX: This is not correct + #define PS_POLY_2D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ + static psPolynomial2D *(NAME) = NULL; \ + if ((NAME) == NULL) { \ + (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \ + p_psMemSetPersistent((NAME), true); \ + } \ + + #define PS_POLY_3D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ + static psPolynomial3D *(NAME) = NULL; \ + if ((NAME) == NULL) { \ + (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \ + p_psMemSetPersistent((NAME), true); \ + } \ + + #define PS_POLY_4D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ + static psPolynomial4D *(NAME) = NULL; \ + if ((NAME) == NULL) { \ + (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \ + p_psMemSetPersistent((NAME), true); \ + } \ +*/ #define PS_POLY_1D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ static psPolynomial1D *(NAME) = NULL; \ if ((NAME) == NULL) { \ - (NAME) = psPolynomial1DAlloc(ORDER, TYPE); \ + (NAME) = psPolynomial1DAlloc(TYPE, ORDER); \ p_psMemSetPersistent((NAME), true); \ } \ -#define PS_POLY_2D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ -static psPolynomial2D *(NAME) = NULL; \ -if ((NAME) == NULL) { \ - (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \ - p_psMemSetPersistent((NAME), true); \ -} \ - -#define PS_POLY_3D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ -static psPolynomial3D *(NAME) = NULL; \ -if ((NAME) == NULL) { \ - (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \ - p_psMemSetPersistent((NAME), true); \ -} \ - -#define PS_POLY_4D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ -static psPolynomial4D *(NAME) = NULL; \ -if ((NAME) == NULL) { \ - (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \ - p_psMemSetPersistent((NAME), true); \ -} \ +/* XXX: This is not correct + #define PS_POLY_2D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ + static psPolynomial2D *(NAME) = NULL; \ + if ((NAME) == NULL) { \ + (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \ + p_psMemSetPersistent((NAME), true); \ + } \ + + #define PS_POLY_3D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ + static psPolynomial3D *(NAME) = NULL; \ + if ((NAME) == NULL) { \ + (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \ + p_psMemSetPersistent((NAME), true); \ + } \ + + #define PS_POLY_4D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \ + static psPolynomial4D *(NAME) = NULL; \ + if ((NAME) == NULL) { \ + (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \ + p_psMemSetPersistent((NAME), true); \ + } \ +*/ #define PS_POLY_PRINT_1D(NAME) \ Index: /trunk/psLib/src/math/psMinimizeLMM.c =================================================================== --- /trunk/psLib/src/math/psMinimizeLMM.c (revision 6203) +++ /trunk/psLib/src/math/psMinimizeLMM.c (revision 6204) @@ -10,6 +10,6 @@ * @author EAM, IfA * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-21 02:43:31 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -204,4 +204,5 @@ psMinimizeLMChi2Func func) { + // XXX: Check vector sizes. PS_ASSERT_IMAGE_NON_NULL(alpha, NAN); PS_ASSERT_VECTOR_NON_NULL(beta, NAN); @@ -218,6 +219,6 @@ // zero alpha and beta for summing below - for (int j = 0; j < params->n; j++) { - for (int k = 0; k < params->n; k++) { + for (psS32 j = 0; j < params->n; j++) { + for (psS32 k = 0; k < params->n; k++) { alpha->data.F64[j][k] = 0; } @@ -227,5 +228,5 @@ // calculate chisq, alpha, beta - for (int i = 0; i < y->n; i++) { + for (psS32 i = 0; i < y->n; i++) { ymodel = func(deriv, params, (psVector *) x->data[i]); @@ -233,9 +234,9 @@ chisq += PS_SQR(delta) * dy->data.F32[i]; - for (int j = 0; j < params->n; j++) { + for (psS32 j = 0; j < params->n; j++) { if ((paramMask != NULL) && (paramMask->data.U8[j])) continue; weight = deriv->data.F32[j] * dy->data.F32[i]; - for (int k = 0; k <= j; k++) { + for (psS32 k = 0; k <= j; k++) { if ((paramMask != NULL) && (paramMask->data.U8[k])) continue; @@ -247,6 +248,6 @@ // calculate lower-left half of alpha - for (int j = 1; j < params->n; j++) { - for (int k = 0; k < j; k++) { + for (psS32 j = 1; j < params->n; j++) { + for (psS32 k = 0; k < j; k++) { alpha->data.F64[k][j] = alpha->data.F64[j][k]; } @@ -255,5 +256,5 @@ // fill in pivots if we apply a mask if (paramMask != NULL) { - for (int j = 0; j < params->n; j++) { + for (psS32 j = 0; j < params->n; j++) { if (paramMask->data.U8[j]) { alpha->data.F64[j][j] = 1; Index: /trunk/psLib/src/math/psMinimizePolyFit.c =================================================================== --- /trunk/psLib/src/math/psMinimizePolyFit.c (revision 6203) +++ /trunk/psLib/src/math/psMinimizePolyFit.c (revision 6204) @@ -10,6 +10,6 @@ * @author EAM, IfA * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-26 00:31:19 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -350,5 +350,5 @@ // We first fit an ordinary polynomial to the data. // - psPolynomial1D *ordPoly = psPolynomial1DAlloc(polyOrder, PS_POLYNOMIAL_ORD); + psPolynomial1D *ordPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, polyOrder); psPolynomial1D *rc = VectorFitPolynomial1DOrd(ordPoly, mask, maskValue, y, yErr, x); if (rc == NULL) { @@ -965,5 +965,5 @@ } } else { - psError(PS_ERR_UNKNOWN, true, "Incorrect polynomial type. Returning NULL.\n"); + psError(PS_ERR_UNKNOWN, true, "Incorrect polynomial type (%d). Returning NULL.\n", poly->type); poly = NULL; } Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 6203) +++ /trunk/psLib/src/math/psPolynomial.c (revision 6204) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * -* @version $Revision: 1.139 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-26 02:44:56 $ +* @version $Revision: 1.140 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -168,5 +168,5 @@ psPolynomial1D **chebPolys = (psPolynomial1D **) psAlloc(numPolys * sizeof(psPolynomial1D *)); for (psS32 i = 0; i < numPolys; i++) { - chebPolys[i] = psPolynomial1DAlloc(i, PS_POLYNOMIAL_ORD); + chebPolys[i] = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, i); chebPolys[i]->coeff[i] = 1; } @@ -175,5 +175,5 @@ psPolynomial1D **chebPolys = (psPolynomial1D **) psAlloc(numPolys * sizeof(psPolynomial1D *)); for (psS32 i = 0; i < numPolys; i++) { - chebPolys[i] = psPolynomial1DAlloc(i, PS_POLYNOMIAL_ORD); + chebPolys[i] = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, i); } @@ -615,9 +615,9 @@ *****************************************************************************/ psPolynomial1D* psPolynomial1DAlloc( - unsigned int n, - psPolynomialType type) + psPolynomialType type, + unsigned int nX) { //PS_ASSERT_INT_NONNEGATIVE(n, NULL); - psU32 nOrder = n; + psU32 nOrder = nX; psPolynomial1D *newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree); @@ -639,7 +639,8 @@ } -psPolynomial2D* psPolynomial2DAlloc( unsigned int nX, - unsigned int nY, - psPolynomialType type) +psPolynomial2D* psPolynomial2DAlloc( + psPolynomialType type, + unsigned int nX, + unsigned int nY) { //PS_ASSERT_INT_NONNEGATIVE(nX, NULL); @@ -676,8 +677,9 @@ } -psPolynomial3D* psPolynomial3DAlloc( unsigned int nX, - unsigned int nY, - unsigned int nZ, - psPolynomialType type) +psPolynomial3D* psPolynomial3DAlloc( + psPolynomialType type, + unsigned int nX, + unsigned int nY, + unsigned int nZ) { //PS_ASSERT_INT_NONNEGATIVE(nX, NULL); @@ -724,9 +726,10 @@ } -psPolynomial4D* psPolynomial4DAlloc( unsigned int nX, - unsigned int nY, - unsigned int nZ, - unsigned int nT, - psPolynomialType type) +psPolynomial4D* psPolynomial4DAlloc( + psPolynomialType type, + unsigned int nX, + unsigned int nY, + unsigned int nZ, + unsigned int nT) { //PS_ASSERT_INT_NONNEGATIVE(nX, NULL); Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 6203) +++ /trunk/psLib/src/math/psPolynomial.h (revision 6204) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-23 22:25:31 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -127,6 +127,6 @@ */ psPolynomial1D* psPolynomial1DAlloc( - unsigned int n, ///< Number of terms - psPolynomialType type ///< Polynomial Type + psPolynomialType type, ///< Polynomial Type + unsigned int nX ///< Number of terms ); @@ -136,30 +136,30 @@ */ psPolynomial2D* psPolynomial2DAlloc( + psPolynomialType type, ///< Polynomial Type + unsigned int nX, ///< Number of terms in x + unsigned int nY ///< Number of terms in y +); + +/** Allocates a 3-D polynomial structure + * + * @return psPolynomial3D* new 3-D polynomial struct + */ +psPolynomial3D* psPolynomial3DAlloc( + psPolynomialType type, ///< Polynomial Type unsigned int nX, ///< Number of terms in x unsigned int nY, ///< Number of terms in y - psPolynomialType type ///< Polynomial Type -); - -/** Allocates a 3-D polynomial structure - * - * @return psPolynomial3D* new 3-D polynomial struct - */ -psPolynomial3D* psPolynomial3DAlloc( + unsigned int nZ ///< Number of terms in z +); + +/** Allocates a 4-D polynomial structure + * + * @return psPolynomial4D* new 4-D polynomial struct + */ +psPolynomial4D* psPolynomial4DAlloc( + psPolynomialType type, ///< Polynomial Type unsigned int nX, ///< Number of terms in x unsigned int nY, ///< Number of terms in y unsigned int nZ, ///< Number of terms in z - psPolynomialType type ///< Polynomial Type -); - -/** Allocates a 4-D polynomial structure - * - * @return psPolynomial4D* new 4-D polynomial struct - */ -psPolynomial4D* psPolynomial4DAlloc( - unsigned int nX, ///< Number of terms in x - unsigned int nY, ///< Number of terms in y - unsigned int nZ, ///< Number of terms in z - unsigned int nT, ///< Number of terms in t - psPolynomialType type ///< Polynomial Type + unsigned int nT ///< Number of terms in t ); Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 6203) +++ /trunk/psLib/src/math/psSpline.c (revision 6204) @@ -7,6 +7,6 @@ * splines. * -* @version $Revision: 1.133 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-23 22:25:31 $ +* @version $Revision: 1.134 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -507,5 +507,5 @@ spline->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *)); for (psS32 i=0;ispline[i] = psPolynomial1DAlloc(3, PS_POLYNOMIAL_ORD); + spline->spline[i] = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 3); } Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 6203) +++ /trunk/psLib/src/math/psStats.c (revision 6204) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.161 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-26 00:31:19 $ + * @version $Revision: 1.162 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1457,5 +1457,5 @@ psVector *y = psVectorAlloc(3, PS_TYPE_F64); psVector *yErr = psVectorAlloc(3, PS_TYPE_F64); - psPolynomial1D *myPoly = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD); + psPolynomial1D *myPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 2); psF32 tmpFloat = 0.0f; Index: /trunk/psLib/src/types/psLookupTable.c =================================================================== --- /trunk/psLib/src/types/psLookupTable.c (revision 6203) +++ /trunk/psLib/src/types/psLookupTable.c (revision 6204) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-16 02:40:13 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -841,6 +841,8 @@ } -psVector* psLookupTableInterpolateAll(const psLookupTable *table, - double index) +psVector* psLookupTableInterpolateAll( + const psLookupTable *table, + double index, + psVector *stats) { long numCols = 0; @@ -851,4 +853,8 @@ numCols = table->values->n; PS_ASSERT_INT_UNEQUAL(numCols, 0,NULL); + if (stats != NULL) { + // XXX: Determine what the stats vector is for. Not documented in SDRS. + psLogMsg(__func__, PS_LOG_WARN, "WARNING: the psVector stats is currently ignored by this function.\n"); + } // Create output vector Index: /trunk/psLib/src/types/psLookupTable.h =================================================================== --- /trunk/psLib/src/types/psLookupTable.h (revision 6203) +++ /trunk/psLib/src/types/psLookupTable.h (revision 6204) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-30 01:14:13 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,4 +19,5 @@ #include "psVector.h" #include "psArray.h" +#include "psLogMsg.h" @@ -138,6 +139,7 @@ */ psVector* psLookupTableInterpolateAll( - const psLookupTable *table, ///< Table with data - double index ///< Value to be interpolated + const psLookupTable *table, ///< Table with data + double index, ///< Value to be interpolated + psVector *stats ///< Unknown ); Index: /trunk/psLib/test/astronomy/tst_psAstrometry01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 6203) +++ /trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 6204) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-20 01:21:13 $ +* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * XXX: Must test @@ -113,6 +113,6 @@ NAME = (psPlaneTransform *) psAlloc(sizeof(psPlaneTransform)); \ psMemSetDeallocator(NAME, (psFreeFunc) psPlaneTransformFree); \ - NAME->x = psPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \ - NAME->y = psPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \ + NAME->x = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); \ + NAME->y = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); \ NAME->x->coeff[1][0] = 1.0; \ NAME->y->coeff[0][1] = 1.0; \ @@ -123,6 +123,6 @@ NAME = (psPlaneDistort *) psAlloc(sizeof(psPlaneDistort)); \ psMemSetDeallocator(NAME, (psFreeFunc) psPlaneDistortFree); \ - NAME->x = psPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \ - NAME->y = psPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \ + NAME->x = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 2, 2, 2, 2); \ + NAME->y = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 2, 2, 2, 2); \ NAME->x->coeff[1][0][0][0] = 1.0; \ NAME->y->coeff[0][1][0][0] = 1.0; \ Index: /trunk/psLib/test/imageops/tst_psImageStats.c =================================================================== --- /trunk/psLib/test/imageops/tst_psImageStats.c (revision 6203) +++ /trunk/psLib/test/imageops/tst_psImageStats.c (revision 6204) @@ -410,5 +410,5 @@ } } - my2DPoly = psPolynomial2DAlloc( CHEBY_X_DIM-1, CHEBY_Y_DIM-1, PS_POLYNOMIAL_CHEB ); + my2DPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, CHEBY_X_DIM-1, CHEBY_Y_DIM-1); /*************************************************************************/ /* Calculate Chebyshev Polynomials, no mask */ @@ -571,5 +571,5 @@ } - psPolynomial2D *chebys = psPolynomial2DAlloc(5, 5, PS_POLYNOMIAL_CHEB); + psPolynomial2D *chebys = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, 5, 5); chebys = psImageFitPolynomial(chebys, tmpImage); @@ -634,5 +634,5 @@ } - psPolynomial2D *chebys = psPolynomial2DAlloc(5, 5, PS_POLYNOMIAL_CHEB); + psPolynomial2D *chebys = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, 5, 5); chebys = psImageFitPolynomial(chebys, tmpImage); @@ -765,4 +765,5 @@ return 100; } + //Test for invalid region (0 pixels, lower = upper) reg.x0 = 1; Index: /trunk/psLib/test/math/tst_psFunc08.c =================================================================== --- /trunk/psLib/test/math/tst_psFunc08.c (revision 6203) +++ /trunk/psLib/test/math/tst_psFunc08.c (revision 6204) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-22 20:45:43 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * XXX: Probably should test single- and multi-dimensional polynomials in @@ -62,6 +62,6 @@ // Allocate polynomial structure - psPolynomial1D* polyOrd = psPolynomial1DAlloc(TERMS-1, PS_POLYNOMIAL_ORD); - psPolynomial1D* polyCheb = psPolynomial1DAlloc(TERMS-1, PS_POLYNOMIAL_CHEB); + psPolynomial1D* polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1); + psPolynomial1D* polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -90,5 +90,5 @@ // Allocate polynomial with invalid type - polyOrd = psPolynomial1DAlloc(TERMS-1, 99); + polyOrd = psPolynomial1DAlloc(99, TERMS-1); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); @@ -107,6 +107,6 @@ { // Allocate polynomial - psPolynomial1D* polyOrd = psPolynomial1DAlloc(TERMS-1,PS_POLYNOMIAL_ORD); - psPolynomial1D* polyCheb = psPolynomial1DAlloc(TERMS-1,PS_POLYNOMIAL_CHEB); + psPolynomial1D* polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1); + psPolynomial1D* polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1); // Set polynomial members Index: /trunk/psLib/test/math/tst_psFunc09.c =================================================================== --- /trunk/psLib/test/math/tst_psFunc09.c (revision 6203) +++ /trunk/psLib/test/math/tst_psFunc09.c (revision 6204) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-22 20:45:43 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -89,6 +89,6 @@ // Allocate polynomial structure - psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD); - psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB); + psPolynomial2D* polyOrd = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1); + psPolynomial2D* polyCheb = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -117,5 +117,5 @@ // Allocate polynomial with invalid type - polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, 99); + polyOrd = psPolynomial2DAlloc(99, TERMS-1, TERMS-1); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); @@ -134,6 +134,6 @@ psBool testStatus = true; // Allocate polynomial - psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_ORD); - psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_CHEB); + psPolynomial2D* polyOrd = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1); + psPolynomial2D* polyCheb = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1); // Set polynomial members Index: /trunk/psLib/test/math/tst_psFunc10.c =================================================================== --- /trunk/psLib/test/math/tst_psFunc10.c (revision 6203) +++ /trunk/psLib/test/math/tst_psFunc10.c (revision 6204) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-22 22:22:15 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -140,6 +140,6 @@ // Allocate polynomial structure - psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_ORD); - psPolynomial3D* polyCheb = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_CHEB); + psPolynomial3D* polyOrd = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1); + psPolynomial3D* polyCheb = psPolynomial3DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -174,5 +174,5 @@ // Allocate polynomial with invalid type - polyOrd = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1, 99); + polyOrd = psPolynomial3DAlloc(99, TERMS-1, TERMS-1, TERMS-1); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); @@ -191,6 +191,6 @@ psBool testStatus = true; // Allocate polynomial - psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_ORD); - psPolynomial3D* polyCheb = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_CHEB); + psPolynomial3D* polyOrd = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1); + psPolynomial3D* polyCheb = psPolynomial3DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1); // Set polynomial members Index: /trunk/psLib/test/math/tst_psFunc11.c =================================================================== --- /trunk/psLib/test/math/tst_psFunc11.c (revision 6203) +++ /trunk/psLib/test/math/tst_psFunc11.c (revision 6204) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-26 02:11:01 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -379,6 +379,6 @@ psBool testStatus = true; // Allocate polynomial structure - psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD); - psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB); + psPolynomial4D* polyOrd = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1, TERMS-1); + psPolynomial4D* polyCheb = psPolynomial4DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1, TERMS-1); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -418,5 +418,5 @@ // Allocate polynomial with invalid type - polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, 99); + polyOrd = psPolynomial4DAlloc(99, TERMS-1, TERMS-1, TERMS-1, TERMS-1); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); @@ -435,6 +435,6 @@ psBool testStatus = true; // Allocate polynomial - psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD); - psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB); + psPolynomial4D* polyOrd = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1, TERMS-1); + psPolynomial4D* polyCheb = psPolynomial4DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1, TERMS-1); // Set polynomial members Index: /trunk/psLib/test/math/tst_psPolyFit1D.c =================================================================== --- /trunk/psLib/test/math/tst_psPolyFit1D.c (revision 6203) +++ /trunk/psLib/test/math/tst_psPolyFit1D.c (revision 6204) @@ -84,10 +84,10 @@ if (flags & TS00_POLY_ORD) { printf(" using ordinary polynomials\n"); - myPoly = psPolynomial1DAlloc(polyOrder, PS_POLYNOMIAL_ORD); + myPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, polyOrder); } if (flags & TS00_POLY_CHEB) { printf(" using chebyshev polynomials\n"); - myPoly = psPolynomial1DAlloc(polyOrder, PS_POLYNOMIAL_CHEB); + myPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, polyOrder); } Index: /trunk/psLib/test/math/tst_psPolyFit2D.c =================================================================== --- /trunk/psLib/test/math/tst_psPolyFit2D.c (revision 6203) +++ /trunk/psLib/test/math/tst_psPolyFit2D.c (revision 6204) @@ -90,5 +90,5 @@ if (flags & TS00_POLY_ORD) { printf(" using ordinary polynomials\n"); - myPoly = psPolynomial2DAlloc(polyOrderX, polyOrderY, PS_POLYNOMIAL_ORD); + myPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, polyOrderX, polyOrderY); } Index: /trunk/psLib/test/math/tst_psPolyFit3D.c =================================================================== --- /trunk/psLib/test/math/tst_psPolyFit3D.c (revision 6203) +++ /trunk/psLib/test/math/tst_psPolyFit3D.c (revision 6204) @@ -107,5 +107,5 @@ if (flags & TS00_POLY_ORD) { printf(" using ordinary polynomials\n"); - myPoly = psPolynomial3DAlloc(polyOrderX, polyOrderY, polyOrderZ, PS_POLYNOMIAL_ORD); + myPoly = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, polyOrderX, polyOrderY, polyOrderZ); } Index: /trunk/psLib/test/math/tst_psPolyFit4D.c =================================================================== --- /trunk/psLib/test/math/tst_psPolyFit4D.c (revision 6203) +++ /trunk/psLib/test/math/tst_psPolyFit4D.c (revision 6204) @@ -120,5 +120,5 @@ if (flags & TS00_POLY_ORD) { printf(" using ordinary polynomials\n"); - myPoly = psPolynomial4DAlloc(polyOrderX, polyOrderY, polyOrderZ, polyOrderT, PS_POLYNOMIAL_ORD); + myPoly = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, polyOrderX, polyOrderY, polyOrderZ, polyOrderT); } Index: /trunk/psLib/test/math/tst_psSpline1D.c =================================================================== --- /trunk/psLib/test/math/tst_psSpline1D.c (revision 6203) +++ /trunk/psLib/test/math/tst_psSpline1D.c (revision 6204) @@ -13,6 +13,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-12-01 01:20:38 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -120,5 +120,5 @@ tmpSline->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *)); for (psS32 i=0;ispline[i] = psPolynomial1DAlloc(3, PS_POLYNOMIAL_ORD); + spline->spline[i] = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 3); } */ Index: /trunk/psLib/test/sys/tst_psMemory.c =================================================================== --- /trunk/psLib/test/sys/tst_psMemory.c (revision 6203) +++ /trunk/psLib/test/sys/tst_psMemory.c (revision 6204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-14 22:18:48 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -712,5 +712,5 @@ psPolynomial1D *poly1; - poly1 = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD); + poly1 = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 2); if ( !psMemCheckType(PS_DATA_POLYNOMIAL1D, poly1) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckPolynomial1D failed in memCheckType. \n"); @@ -721,5 +721,5 @@ psPolynomial2D *poly2; - poly2 = psPolynomial2DAlloc(2, 1, PS_POLYNOMIAL_ORD); + poly2 = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 1); if ( !psMemCheckType(PS_DATA_POLYNOMIAL2D, poly2) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckPolynomial2D failed in memCheckType. \n"); @@ -730,5 +730,5 @@ psPolynomial3D *poly3; - poly3 = psPolynomial3DAlloc(2, 1, 2, PS_POLYNOMIAL_ORD); + poly3 = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, 2, 1, 1); if ( !psMemCheckType(PS_DATA_POLYNOMIAL3D, poly3) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckPolynomial3D failed in memCheckType. \n"); @@ -739,5 +739,5 @@ psPolynomial4D *poly4; - poly4 = psPolynomial4DAlloc(2, 1, 2, 1, PS_POLYNOMIAL_ORD); + poly4 = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 2, 1, 2, 1); if ( !psMemCheckType(PS_DATA_POLYNOMIAL4D, poly4) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckPolynomial4D failed in memCheckType. \n"); Index: /trunk/psLib/test/types/tst_psLookupTable_01.c =================================================================== --- /trunk/psLib/test/types/tst_psLookupTable_01.c (revision 6203) +++ /trunk/psLib/test/types/tst_psLookupTable_01.c (revision 6204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-10-13 00:38:56 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-26 21:10:22 $ * * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii @@ -816,5 +816,5 @@ // Interpolate values with NULL table psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL table"); - interpValues = psLookupTableInterpolateAll(table1,5); + interpValues = psLookupTableInterpolateAll(table1,5, NULL); if(interpValues != NULL ) { psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL table"); @@ -829,5 +829,5 @@ return 6; } - interpValues = psLookupTableInterpolateAll(table1,5.25); + interpValues = psLookupTableInterpolateAll(table1,5.25, NULL); if(interpValues == NULL) { psError(PS_ERR_UNKNOWN,true,"Returned vector is NULL."); @@ -844,5 +844,5 @@ // Interpolate values with index outside table - interpValues = psLookupTableInterpolateAll(table1,0); + interpValues = psLookupTableInterpolateAll(table1,0, NULL); if(interpValues != NULL) { psError(PS_ERR_UNKNOWN,true,"Did return NULL");