Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 3989) +++ /trunk/psLib/src/astro/psCoord.c (revision 3990) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 05:18:20 $ +* @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-19 23:57:36 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -89,5 +89,5 @@ (Y2 * (1.0 / (F - ((C*E)/B)))); -XXX: Since thre is now a general psPlaneTransformInvert() function, we +XXX: Since there is now a general psPlaneTransformInvert() function, we should rename this. *****************************************************************************/ @@ -122,4 +122,25 @@ psPlaneTransform *out = psPlaneTransformAlloc(2, 2); + /* This is sample code from IfA. It didn't work initially, and I did not + spend any time debugging it. + + psF64 a = transform->x->coeff[1][0]; + psF64 b = transform->x->coeff[0][1]; + psF64 c = transform->y->coeff[1][0]; + psF64 d = transform->y->coeff[0][1]; + psF64 e = transform->x->coeff[0][0]; + psF64 f = transform->y->coeff[0][0]; + + psF64 invDet = 1.0 / (a * d - b * c); // Inverse of the determinant + + // Not entirely sure why this works, but it appears to do so....................................! + out->x->coeff[1][0] = invDet * a; + out->x->coeff[0][1] = - invDet * b; + out->y->coeff[1][0] = - invDet * c; + out->y->coeff[0][1] = invDet * d; + + out->x->coeff[0][0] = - invDet * (d * e + c * f); + out->y->coeff[0][0] = - invDet * (b * e + a * f); + */ out->x->coeff[0][0] = (-D + ((F*A)/C)) / (E - ((F*B)/C)); out->x->coeff[1][0] = -(F/C) / (E - ((F*B)/C)); @@ -1032,4 +1053,6 @@ psS32 numCoords = PS_MIN(source->n, dest->n); psS32 order = PS_MAX(trans->x->nX, trans->x->nY); + order = PS_MAX(order, trans->y->nX); + order = PS_MAX(order, trans->y->nY); // @@ -1133,5 +1156,5 @@ psPlaneTransform *psPlaneTransformInvert(psPlaneTransform *out, const psPlaneTransform *in, - psRegion region, + psRegion *region, int nSamples) { @@ -1151,5 +1174,5 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Input transformation must have same nX==nY."); } - psS32 order = PS_MAX(in->x->nX, in->x->nY); + psS32 order = in->x->nX; psPlaneTransform *myPT = NULL; @@ -1197,5 +1220,7 @@ // - // Initialize the grid. + // Initialize the grid. Since we want the inverse of the transformation, the + // inCoords are written to the outData vector, and the outCoords are written + // to the inData vector. // psS32 cnt = 0; @@ -1205,5 +1230,4 @@ inCoord->x = region.x0 + ((psF32) xint) * ((region.x1 - region.x0) / ((psF32) nSamples)); (void)psPlaneTransformApply(outCoord, in, inCoord); - ((psPlane *) outData->data[cnt])->x = inCoord->x; ((psPlane *) outData->data[cnt])->y = inCoord->y; @@ -1214,4 +1238,5 @@ } } + // XXX: what values should be used here? bool rc = psPlaneTransformFit(myPT, inData, outData, 10, 100.0); Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 3989) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 3990) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 05:18:20 $ +* @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-19 23:57:36 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -89,5 +89,5 @@ (Y2 * (1.0 / (F - ((C*E)/B)))); -XXX: Since thre is now a general psPlaneTransformInvert() function, we +XXX: Since there is now a general psPlaneTransformInvert() function, we should rename this. *****************************************************************************/ @@ -122,4 +122,25 @@ psPlaneTransform *out = psPlaneTransformAlloc(2, 2); + /* This is sample code from IfA. It didn't work initially, and I did not + spend any time debugging it. + + psF64 a = transform->x->coeff[1][0]; + psF64 b = transform->x->coeff[0][1]; + psF64 c = transform->y->coeff[1][0]; + psF64 d = transform->y->coeff[0][1]; + psF64 e = transform->x->coeff[0][0]; + psF64 f = transform->y->coeff[0][0]; + + psF64 invDet = 1.0 / (a * d - b * c); // Inverse of the determinant + + // Not entirely sure why this works, but it appears to do so....................................! + out->x->coeff[1][0] = invDet * a; + out->x->coeff[0][1] = - invDet * b; + out->y->coeff[1][0] = - invDet * c; + out->y->coeff[0][1] = invDet * d; + + out->x->coeff[0][0] = - invDet * (d * e + c * f); + out->y->coeff[0][0] = - invDet * (b * e + a * f); + */ out->x->coeff[0][0] = (-D + ((F*A)/C)) / (E - ((F*B)/C)); out->x->coeff[1][0] = -(F/C) / (E - ((F*B)/C)); @@ -1032,4 +1053,6 @@ psS32 numCoords = PS_MIN(source->n, dest->n); psS32 order = PS_MAX(trans->x->nX, trans->x->nY); + order = PS_MAX(order, trans->y->nX); + order = PS_MAX(order, trans->y->nY); // @@ -1133,5 +1156,5 @@ psPlaneTransform *psPlaneTransformInvert(psPlaneTransform *out, const psPlaneTransform *in, - psRegion region, + psRegion *region, int nSamples) { @@ -1151,5 +1174,5 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Input transformation must have same nX==nY."); } - psS32 order = PS_MAX(in->x->nX, in->x->nY); + psS32 order = in->x->nX; psPlaneTransform *myPT = NULL; @@ -1197,5 +1220,7 @@ // - // Initialize the grid. + // Initialize the grid. Since we want the inverse of the transformation, the + // inCoords are written to the outData vector, and the outCoords are written + // to the inData vector. // psS32 cnt = 0; @@ -1205,5 +1230,4 @@ inCoord->x = region.x0 + ((psF32) xint) * ((region.x1 - region.x0) / ((psF32) nSamples)); (void)psPlaneTransformApply(outCoord, in, inCoord); - ((psPlane *) outData->data[cnt])->x = inCoord->x; ((psPlane *) outData->data[cnt])->y = inCoord->y; @@ -1214,4 +1238,5 @@ } } + // XXX: what values should be used here? bool rc = psPlaneTransformFit(myPT, inData, outData, 10, 100.0); Index: /trunk/psLib/src/collections/psPixels.h =================================================================== --- /trunk/psLib/src/collections/psPixels.h (revision 3989) +++ /trunk/psLib/src/collections/psPixels.h (revision 3990) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-18 21:38:19 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:36 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -79,6 +79,6 @@ * * psPixelsToMask shall return an image of type U8 with the pixels lying - * within the specified region set to the maskVal. The out image shall be - * modified if supplied, or allocated and returned if NULL. The size of the + * within the specified region set to the maskVal. The out image shall be + * modified if supplied, or allocated and returned if NULL. The size of the * output image shall be region->x1 - region->x0 by region->y1 - region->y0, * with out->x0 = region->x0 and out->y0 = region->y0. In the event that Index: /trunk/psLib/src/dataManip/psConstants.h =================================================================== --- /trunk/psLib/src/dataManip/psConstants.h (revision 3989) +++ /trunk/psLib/src/dataManip/psConstants.h (revision 3990) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.66 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 22:02:16 $ + * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,4 +17,8 @@ * that we ensure that an argument which is expected to be output is * psFree'ed before reurning NULL. + * + * XXX: The macros have a name similar to PS_CHECK_CONDITION() and generally + * throw a psError if the CONDITION is true. However, some throw the error + * if the CONDITION is false. This should be consistant. * */ @@ -68,4 +72,15 @@ } +// Return an error if the arg is less than zero. +#define PS_INT_CHECK_NEGATIVE(NAME, RVAL) \ +if (NAME < 0) { \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + "Error: %s is less than 0.", #NAME); \ + return(RVAL); \ +} + +// Return an error if the arg is less than zero. +// XXX: This naming scheme is opposite most other macros. This should be +// corrected as soon as a fresh checkin/out can be performed. #define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \ if (NAME < 0) { \ @@ -75,4 +90,7 @@ } +// Return an error if the arg is less than or equal to zero. +// XXX: This naming scheme is opposite most other macros. This should be +// corrected as soon as a fresh checkin/out can be performed. #define PS_INT_CHECK_POSITIVE(NAME, RVAL) \ if (NAME < 1) { \ @@ -82,6 +100,15 @@ } +// Return an error if the arg is not equal to zero. +#define PS_INT_CHECK_NON_ZERO(NAME, RVAL) \ +if (NAME != 0) { \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + "Error: %s is 0.", #NAME); \ + return(RVAL); \ +} + +// Return an error if the arg is equal to zero. #define PS_INT_CHECK_ZERO(NAME, RVAL) \ -if (NAME < 1) { \ +if (NAME == 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ "Error: %s is 0.", #NAME); \ @@ -89,4 +116,5 @@ } +// Return an error if the arg is lies outside the supplied range. #define PS_INT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((int)NAME < LOWER || (int)NAME > UPPER) { \ @@ -106,5 +134,4 @@ } - // Produce an error if ((NAME1 > NAME2) #define PS_FLOAT_COMPARE(NAME1, NAME2, RVAL) \ @@ -116,4 +143,6 @@ } +// Generate an error if the two floats are equal. +// XXX: Inconsistent naming. #define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \ if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \ @@ -124,4 +153,5 @@ } +// Return an error if the arg is lies outside the supplied range. #define PS_FLOAT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \ Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 3989) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 3990) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.102 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 22:53:47 $ + * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -247,6 +247,4 @@ { PS_INT_CHECK_NON_NEGATIVE(maxChebyPoly, NULL); - - printf("HERE: 00\n"); psPolynomial1D **chebPolys = NULL; Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 3989) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 3990) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.118 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:52:19 $ + * @version $Revision: 1.119 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1437,5 +1437,5 @@ min->value = 0.0; min->iter = 0; - min->lastDelta = tol + 1; + min->lastDelta = NAN; return(min); Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 3989) +++ /trunk/psLib/src/dataManip/psStats.c (revision 3990) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.126 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-26 19:53:30 $ + * @version $Revision: 1.127 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1512,4 +1512,5 @@ // Determine minimum and maximum values in the data vector. + // XXX: remove this conditional? if (isnan(tmpStats->min)) { if (0 != p_psVectorMin(myVector, maskVector, maskVal, tmpStats)) { @@ -1519,4 +1520,5 @@ } } + // XXX: remove this conditional? if (isnan(tmpStats->max)) { if (0 != p_psVectorMax(myVector, maskVector, maskVal, tmpStats)) { @@ -1656,5 +1658,5 @@ } - + // XXX: Must fit a 2-D polynomial, not a Gaussian. (bug 366) psBool rc = psMinimizeLMChi2(min, NULL, Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 3989) +++ /trunk/psLib/src/image/psImage.h (revision 3990) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 05:18:20 $ + * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #include - +#include #include "psType.h" #include "psArray.h" Index: /trunk/psLib/src/math/psConstants.h =================================================================== --- /trunk/psLib/src/math/psConstants.h (revision 3989) +++ /trunk/psLib/src/math/psConstants.h (revision 3990) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.66 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 22:02:16 $ + * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,4 +17,8 @@ * that we ensure that an argument which is expected to be output is * psFree'ed before reurning NULL. + * + * XXX: The macros have a name similar to PS_CHECK_CONDITION() and generally + * throw a psError if the CONDITION is true. However, some throw the error + * if the CONDITION is false. This should be consistant. * */ @@ -68,4 +72,15 @@ } +// Return an error if the arg is less than zero. +#define PS_INT_CHECK_NEGATIVE(NAME, RVAL) \ +if (NAME < 0) { \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + "Error: %s is less than 0.", #NAME); \ + return(RVAL); \ +} + +// Return an error if the arg is less than zero. +// XXX: This naming scheme is opposite most other macros. This should be +// corrected as soon as a fresh checkin/out can be performed. #define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \ if (NAME < 0) { \ @@ -75,4 +90,7 @@ } +// Return an error if the arg is less than or equal to zero. +// XXX: This naming scheme is opposite most other macros. This should be +// corrected as soon as a fresh checkin/out can be performed. #define PS_INT_CHECK_POSITIVE(NAME, RVAL) \ if (NAME < 1) { \ @@ -82,6 +100,15 @@ } +// Return an error if the arg is not equal to zero. +#define PS_INT_CHECK_NON_ZERO(NAME, RVAL) \ +if (NAME != 0) { \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + "Error: %s is 0.", #NAME); \ + return(RVAL); \ +} + +// Return an error if the arg is equal to zero. #define PS_INT_CHECK_ZERO(NAME, RVAL) \ -if (NAME < 1) { \ +if (NAME == 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ "Error: %s is 0.", #NAME); \ @@ -89,4 +116,5 @@ } +// Return an error if the arg is lies outside the supplied range. #define PS_INT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((int)NAME < LOWER || (int)NAME > UPPER) { \ @@ -106,5 +134,4 @@ } - // Produce an error if ((NAME1 > NAME2) #define PS_FLOAT_COMPARE(NAME1, NAME2, RVAL) \ @@ -116,4 +143,6 @@ } +// Generate an error if the two floats are equal. +// XXX: Inconsistent naming. #define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \ if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \ @@ -124,4 +153,5 @@ } +// Return an error if the arg is lies outside the supplied range. #define PS_FLOAT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \ Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 3989) +++ /trunk/psLib/src/math/psMinimize.c (revision 3990) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.118 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:52:19 $ + * @version $Revision: 1.119 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1437,5 +1437,5 @@ min->value = 0.0; min->iter = 0; - min->lastDelta = tol + 1; + min->lastDelta = NAN; return(min); Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 3989) +++ /trunk/psLib/src/math/psPolynomial.c (revision 3990) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.102 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 22:53:47 $ + * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -247,6 +247,4 @@ { PS_INT_CHECK_NON_NEGATIVE(maxChebyPoly, NULL); - - printf("HERE: 00\n"); psPolynomial1D **chebPolys = NULL; Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 3989) +++ /trunk/psLib/src/math/psSpline.c (revision 3990) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.102 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 22:53:47 $ + * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -247,6 +247,4 @@ { PS_INT_CHECK_NON_NEGATIVE(maxChebyPoly, NULL); - - printf("HERE: 00\n"); psPolynomial1D **chebPolys = NULL; Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 3989) +++ /trunk/psLib/src/math/psStats.c (revision 3990) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.126 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-26 19:53:30 $ + * @version $Revision: 1.127 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1512,4 +1512,5 @@ // Determine minimum and maximum values in the data vector. + // XXX: remove this conditional? if (isnan(tmpStats->min)) { if (0 != p_psVectorMin(myVector, maskVector, maskVal, tmpStats)) { @@ -1519,4 +1520,5 @@ } } + // XXX: remove this conditional? if (isnan(tmpStats->max)) { if (0 != p_psVectorMax(myVector, maskVector, maskVal, tmpStats)) { @@ -1656,5 +1658,5 @@ } - + // XXX: Must fit a 2-D polynomial, not a Gaussian. (bug 366) psBool rc = psMinimizeLMChi2(min, NULL, Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 3989) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 3990) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 05:18:20 $ + * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #include - +#include #include "psType.h" #include "psArray.h" Index: /trunk/psLib/src/types/psPixels.h =================================================================== --- /trunk/psLib/src/types/psPixels.h (revision 3989) +++ /trunk/psLib/src/types/psPixels.h (revision 3990) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-18 21:38:19 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-19 23:57:36 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -79,6 +79,6 @@ * * psPixelsToMask shall return an image of type U8 with the pixels lying - * within the specified region set to the maskVal. The out image shall be - * modified if supplied, or allocated and returned if NULL. The size of the + * within the specified region set to the maskVal. The out image shall be + * modified if supplied, or allocated and returned if NULL. The size of the * output image shall be region->x1 - region->x0 by region->y1 - region->y0, * with out->x0 = region->x0 and out->y0 = region->y0. In the event that