Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 2999) +++ /trunk/psLib/src/astro/psCoord.c (revision 3000) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-13 22:45:28 $ +* @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-14 23:27:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -333,5 +333,4 @@ */ - // ******************************************** // From the mathworks: http://mathworld.wolfram.com/GnomonicProjection.html @@ -431,10 +430,13 @@ // delta_0 and phi_1 are the projection centers, not the point being projected. // (delta_0, phi_1) == (projection->R, projection->D) + // XXX: figure out how to use the two-argument atan2() here. // ******************************************** psF32 row = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y)); psF32 C = atan(row); - tmp->d = asin((cos(C) * sin(projection->D)) + ((coord->y * sin(C) * cos(projection->D)) / row)); + tmp->d = asin((cos(C) * sin(projection->D)) + + ((coord->y * sin(C) * cos(projection->D)) / row)); psF32 tmpAtan = atan((coord->x * sin(C)) / - ((row * cos(projection->D) * cos(C)) - (coord->y * sin(projection->D) * sin(C)))); + ((row * cos(projection->D) * cos(C)) - + (coord->y * sin(projection->D) * sin(C)))); tmp->r = projection->R + tmpAtan; Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 2999) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 3000) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-14 01:13:15 $ + * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -310,5 +310,5 @@ exp->observatory = psMemIncrRefCounter((psPtr)observatory); - // XXX: how is these value derived? + // XXX: how is this value derived? *(double *)&exp->lst = psTimeToLST((psTime*)time,observatory->longitude); *(float *)&exp->positionAngle = 0.0f; // XXX: need input, see Bug #207 Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 2999) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 3000) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-13 22:45:28 $ +* @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-14 23:27:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -333,5 +333,4 @@ */ - // ******************************************** // From the mathworks: http://mathworld.wolfram.com/GnomonicProjection.html @@ -431,10 +430,13 @@ // delta_0 and phi_1 are the projection centers, not the point being projected. // (delta_0, phi_1) == (projection->R, projection->D) + // XXX: figure out how to use the two-argument atan2() here. // ******************************************** psF32 row = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y)); psF32 C = atan(row); - tmp->d = asin((cos(C) * sin(projection->D)) + ((coord->y * sin(C) * cos(projection->D)) / row)); + tmp->d = asin((cos(C) * sin(projection->D)) + + ((coord->y * sin(C) * cos(projection->D)) / row)); psF32 tmpAtan = atan((coord->x * sin(C)) / - ((row * cos(projection->D) * cos(C)) - (coord->y * sin(projection->D) * sin(C)))); + ((row * cos(projection->D) * cos(C)) - + (coord->y * sin(projection->D) * sin(C)))); tmp->r = projection->R + tmpAtan; Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 2999) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 3000) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.79 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-10 19:47:11 $ + * @version $Revision: 1.80 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1913,4 +1913,5 @@ if (i<(bounds->n-1)) { if (FLT_EPSILON < fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) { + printf("ERROR: psErrorMsg(data points must be distinct\n"); // XXX: psErrorMsg(data points must be distinct) } Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 2999) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 3000) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.98 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-05 20:59:33 $ + * @version $Revision: 1.99 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,4 @@ input parameter "x" between 0 and input parameter polyOrder. The result is returned as a psVector sums. - XXX: Use a static vector. @@ -693,5 +692,5 @@ deriv->data.F32[n][p]; } - // XXX: multiple by -1 here? + // XXX: multiply by -1 here? (beta->data.F64[p])*= -1.0; psTrace(".psLib.dataManip.psMinimize", 6, @@ -1139,11 +1138,12 @@ Algorithm: -XXX completely ad hoc: -start with the user-supplied starting -parameter and call that b. Calculate a/c as a fractional amount -smaller/larger than b. Repeat this process until a local minimum is found. - -XXX: -new algorithm: + +XXX completely ad hoc: +start with the user-supplied starting parameter and +call that b. Calculate a/c as a fractional amount smaller/larger than b. +Repeat this process until a local minimum is found. + +XXX: +new algorithm: start at x=0, expand in one direction until the function decreases. Then you have two points in the bracket. Keep going until it @@ -1151,8 +1151,8 @@ direction. -XXX: +XXX: This is F32 only. -XXX: +XXX: output bracket vector should be an input as well. *****************************************************************************/ Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 2999) +++ /trunk/psLib/src/dataManip/psStats.c (revision 3000) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-14 00:53:56 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1959,6 +1959,4 @@ Returns: The histogram structure "out". - -XXX: Waiting for direction on how to use the errors parameter. *****************************************************************************/ psHistogram* psVectorHistogram(psHistogram* out, Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 2999) +++ /trunk/psLib/src/math/psMinimize.c (revision 3000) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.98 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-05 20:59:33 $ + * @version $Revision: 1.99 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,4 @@ input parameter "x" between 0 and input parameter polyOrder. The result is returned as a psVector sums. - XXX: Use a static vector. @@ -693,5 +692,5 @@ deriv->data.F32[n][p]; } - // XXX: multiple by -1 here? + // XXX: multiply by -1 here? (beta->data.F64[p])*= -1.0; psTrace(".psLib.dataManip.psMinimize", 6, @@ -1139,11 +1138,12 @@ Algorithm: -XXX completely ad hoc: -start with the user-supplied starting -parameter and call that b. Calculate a/c as a fractional amount -smaller/larger than b. Repeat this process until a local minimum is found. - -XXX: -new algorithm: + +XXX completely ad hoc: +start with the user-supplied starting parameter and +call that b. Calculate a/c as a fractional amount smaller/larger than b. +Repeat this process until a local minimum is found. + +XXX: +new algorithm: start at x=0, expand in one direction until the function decreases. Then you have two points in the bracket. Keep going until it @@ -1151,8 +1151,8 @@ direction. -XXX: +XXX: This is F32 only. -XXX: +XXX: output bracket vector should be an input as well. *****************************************************************************/ Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 2999) +++ /trunk/psLib/src/math/psPolynomial.c (revision 3000) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.79 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-10 19:47:11 $ + * @version $Revision: 1.80 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1913,4 +1913,5 @@ if (i<(bounds->n-1)) { if (FLT_EPSILON < fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) { + printf("ERROR: psErrorMsg(data points must be distinct\n"); // XXX: psErrorMsg(data points must be distinct) } Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 2999) +++ /trunk/psLib/src/math/psSpline.c (revision 3000) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.79 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-10 19:47:11 $ + * @version $Revision: 1.80 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1913,4 +1913,5 @@ if (i<(bounds->n-1)) { if (FLT_EPSILON < fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) { + printf("ERROR: psErrorMsg(data points must be distinct\n"); // XXX: psErrorMsg(data points must be distinct) } Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 2999) +++ /trunk/psLib/src/math/psStats.c (revision 3000) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-14 00:53:56 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-14 23:27:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1959,6 +1959,4 @@ Returns: The histogram structure "out". - -XXX: Waiting for direction on how to use the errors parameter. *****************************************************************************/ psHistogram* psVectorHistogram(psHistogram* out,