Index: trunk/psLib/src/math/psMinimize.h =================================================================== --- trunk/psLib/src/math/psMinimize.h (revision 4321) +++ trunk/psLib/src/math/psMinimize.h (revision 4330) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -109,5 +109,5 @@ /** Minimizes a specified function based on the Levenberg-Marquardt method. * - * @return psBool: True if successful. + * @return bool: True if successful. */ bool psMinimizeLMChi2( @@ -165,5 +165,5 @@ /** Minimizes a specified function based on the Powell method. * - * @return psBool: True if successful. + * @return bool: True if successful. */ bool psMinimizePowell( @@ -209,5 +209,5 @@ /** Minimizes a specified function based on the Powell chi-squared method. * - * @return psBool: True is successful. + * @return bool: True is successful. */ bool psMinimizeChi2Powell( Index: trunk/psLib/src/math/psPolynomial.c =================================================================== --- trunk/psLib/src/math/psPolynomial.c (revision 4321) +++ trunk/psLib/src/math/psPolynomial.c (revision 4330) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1822,8 +1822,8 @@ XXX: What should be the defualty type for knots be? psF32 is assumed. *****************************************************************************/ -psSpline1D *psSpline1DAlloc(psS32 numSplines, - psS32 order, - psF32 min, - psF32 max) +psSpline1D *psSpline1DAlloc(int numSplines, + int order, + float min, + float max) { PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); @@ -1867,5 +1867,5 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - psS32 order) + int order) { PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); @@ -2125,7 +2125,7 @@ psF64. *****************************************************************************/ -psF32 psSpline1DEval( +float psSpline1DEval( const psSpline1D *spline, - psF32 x + float x ) { Index: trunk/psLib/src/math/psPolynomial.h =================================================================== --- trunk/psLib/src/math/psPolynomial.h (revision 4321) +++ trunk/psLib/src/math/psPolynomial.h (revision 4330) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * - * @return psF32 value on the gaussian curve given the input parameters + * @return float value on the gaussian curve given the input parameters */ float psGaussian( @@ -218,5 +218,5 @@ */ psVector *psPolynomial2DEvalVector( - const psPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psPolynomial2D *poly, ///< Coefficients for the polynomial const psVector *x, ///< x locations at which to evaluate const psVector *y ///< y locations at which to evaluate @@ -444,8 +444,8 @@ * @return psSpline1D* new 1-D spline struct */ -psSpline1D *psSpline1DAlloc(psS32 n, ///< Number of spline polynomials - psS32 order, ///< Order of spline polynomials - psF32 min, ///< Lower boundary value of spline polynomials - psF32 max); ///< Upper boundary value of spline polynomials +psSpline1D *psSpline1DAlloc(int n, ///< Number of spline polynomials + int order, ///< Order of spline polynomials + float min, ///< Lower boundary value of spline polynomials + float max); ///< Upper boundary value of spline polynomials /** Allocates a psSpline1D structure @@ -456,13 +456,13 @@ */ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, ///< Bounds for spline polynomials - psS32 order); ///< Order of spline polynomials + int order); ///< Order of spline polynomials /** Evaluates 1-D spline polynomials at a specific coordinate. * - * @return psF32 result of spline polynomials evaluated at given location - */ -psF32 psSpline1DEval( + * @return float result of spline polynomials evaluated at given location + */ +float psSpline1DEval( const psSpline1D *spline, ///< Coefficients for spline polynomials - psF32 x ///< location at which to evaluate + float x ///< location at which to evaluate ); Index: trunk/psLib/src/math/psRandom.c =================================================================== --- trunk/psLib/src/math/psRandom.c (revision 4321) +++ trunk/psLib/src/math/psRandom.c (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-01 23:51:25 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,5 @@ psRandom *psRandomAlloc(psRandomType type, - psU64 seed) + unsigned long seed) { gsl_rng *r = NULL; @@ -86,5 +86,5 @@ void psRandomReset(psRandom *rand, - psU64 seed) + unsigned long seed) { // Check null psRandom @@ -103,5 +103,5 @@ } -psF64 psRandomUniform(const psRandom *r) +double psRandomUniform(const psRandom *r) { // Check null psRandom variable @@ -116,5 +116,5 @@ } -psF64 psRandomGaussian(const psRandom *r) +double psRandomGaussian(const psRandom *r) { // Check null psRandom variable @@ -130,5 +130,5 @@ } -psF64 psRandomPoisson(const psRandom *r, psF64 mean) +double psRandomPoisson(const psRandom *r, double mean) { // Check null psRandom variable Index: trunk/psLib/src/math/psRandom.h =================================================================== --- trunk/psLib/src/math/psRandom.h (revision 4321) +++ trunk/psLib/src/math/psRandom.h (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-17 00:11:05 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -54,5 +54,5 @@ psRandom *psRandomAlloc( psRandomType type, ///< The type of RNG - psU64 seed ///< Known value with which to seed the RNG + unsigned long seed ///< Known value with which to seed the RNG ); @@ -63,5 +63,5 @@ void psRandomReset( psRandom *rand, ///< Existing psRandom struct to reset - psU64 seed ///< Known value with which to seed the RNG + unsigned long seed ///< Known value with which to seed the RNG ); @@ -69,7 +69,7 @@ * Uses gsl_rng_uniform. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomUniform( +double psRandomUniform( const psRandom *r ///< psRandom struct for RNG ); @@ -78,7 +78,7 @@ * Uses gsl_ran_gaussian. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomGaussian( +double psRandomGaussian( const psRandom *r ///< psRandom struct for RNG ); @@ -87,9 +87,9 @@ * Uses gsl_ran_poisson. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomPoisson( +double psRandomPoisson( const psRandom *r, ///< psRandom struct for RNG - psF64 mean ///< Mean value + double mean ///< Mean value ); Index: trunk/psLib/src/math/psSpline.c =================================================================== --- trunk/psLib/src/math/psSpline.c (revision 4321) +++ trunk/psLib/src/math/psSpline.c (revision 4330) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1822,8 +1822,8 @@ XXX: What should be the defualty type for knots be? psF32 is assumed. *****************************************************************************/ -psSpline1D *psSpline1DAlloc(psS32 numSplines, - psS32 order, - psF32 min, - psF32 max) +psSpline1D *psSpline1DAlloc(int numSplines, + int order, + float min, + float max) { PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); @@ -1867,5 +1867,5 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - psS32 order) + int order) { PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); @@ -2125,7 +2125,7 @@ psF64. *****************************************************************************/ -psF32 psSpline1DEval( +float psSpline1DEval( const psSpline1D *spline, - psF32 x + float x ) { Index: trunk/psLib/src/math/psSpline.h =================================================================== --- trunk/psLib/src/math/psSpline.h (revision 4321) +++ trunk/psLib/src/math/psSpline.h (revision 4330) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * - * @return psF32 value on the gaussian curve given the input parameters + * @return float value on the gaussian curve given the input parameters */ float psGaussian( @@ -218,5 +218,5 @@ */ psVector *psPolynomial2DEvalVector( - const psPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psPolynomial2D *poly, ///< Coefficients for the polynomial const psVector *x, ///< x locations at which to evaluate const psVector *y ///< y locations at which to evaluate @@ -444,8 +444,8 @@ * @return psSpline1D* new 1-D spline struct */ -psSpline1D *psSpline1DAlloc(psS32 n, ///< Number of spline polynomials - psS32 order, ///< Order of spline polynomials - psF32 min, ///< Lower boundary value of spline polynomials - psF32 max); ///< Upper boundary value of spline polynomials +psSpline1D *psSpline1DAlloc(int n, ///< Number of spline polynomials + int order, ///< Order of spline polynomials + float min, ///< Lower boundary value of spline polynomials + float max); ///< Upper boundary value of spline polynomials /** Allocates a psSpline1D structure @@ -456,13 +456,13 @@ */ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, ///< Bounds for spline polynomials - psS32 order); ///< Order of spline polynomials + int order); ///< Order of spline polynomials /** Evaluates 1-D spline polynomials at a specific coordinate. * - * @return psF32 result of spline polynomials evaluated at given location - */ -psF32 psSpline1DEval( + * @return float result of spline polynomials evaluated at given location + */ +float psSpline1DEval( const psSpline1D *spline, ///< Coefficients for spline polynomials - psF32 x ///< location at which to evaluate + float x ///< location at which to evaluate );