Index: trunk/psLib/src/math/psMatrix.c =================================================================== --- trunk/psLib/src/math/psMatrix.c (revision 4315) +++ trunk/psLib/src/math/psMatrix.c (revision 4321) @@ -21,6 +21,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 22:28:07 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-20 22:42:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -191,5 +191,5 @@ psS32 numCols = 0; gsl_matrix *lu = NULL; - gsl_permutation perm; + gsl_permutation permGSL; @@ -212,5 +212,5 @@ // Initialize GSL data - perm.size = numCols; + permGSL.size = numCols; if (sizeof(size_t) == 4) { *outPerm = psVectorRecycle(*outPerm, numCols, PS_TYPE_S32); @@ -225,5 +225,5 @@ (*outPerm)->n = numCols; - perm.data = (psPtr)((*outPerm)->data.U8); + permGSL.data = (psPtr)((*outPerm)->data.U8); lu = gsl_matrix_alloc(numRows, numCols); @@ -232,5 +232,5 @@ // Calculate LU decomposition - gsl_linalg_LU_decomp(lu, &perm, &signum); // N.B., uses Gaussian Elimination with partial pivoting. + gsl_linalg_LU_decomp(lu, &permGSL, &signum); // N.B., uses Gaussian Elimination with partial pivoting. // Copy GSL matrix data to psImage data @@ -298,5 +298,5 @@ } -psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, psF32 *det) +psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *det) { psS32 signum = 0; @@ -346,5 +346,5 @@ } -psF32 *psMatrixDeterminant(const psImage* inImage) +float *psMatrixDeterminant(const psImage* in) { psS32 signum = 0; @@ -357,17 +357,17 @@ #define DETERMINANT_EXIT { return NULL; } // Error checks - PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, DETERMINANT_EXIT); - PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, DETERMINANT_EXIT); - PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, DETERMINANT_EXIT); - PS_CHECK_SQUARE(inImage, DETERMINANT_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, DETERMINANT_EXIT); + PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, DETERMINANT_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, DETERMINANT_EXIT); + PS_CHECK_SQUARE(in, DETERMINANT_EXIT); // Initialize data - numRows = inImage->numRows; - numCols = inImage->numCols; + numRows = in->numRows; + numCols = in->numCols; // Allocate GSL structs perm = gsl_permutation_alloc(numRows); lu = gsl_matrix_alloc(numRows, numCols); - psImageToGslMatrix(lu, inImage); + psImageToGslMatrix(lu, in); // Calculate determinant @@ -480,5 +480,5 @@ } -psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage) +psImage* psMatrixEigenvectors(psImage* out, psImage* in) { psS32 numRows = 0; @@ -486,23 +486,23 @@ gsl_vector *eVals = NULL; gsl_eigen_symmv_workspace *w = NULL; - gsl_matrix *out = NULL; - gsl_matrix *in = NULL; - - #define EIGENVECTORS_CLEANUP { psFree(outImage); return NULL; } - // Error checks - PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, EIGENVECTORS_CLEANUP); - PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP); - PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, EIGENVECTORS_CLEANUP); - PS_CHECK_POINTERS(inImage, outImage, EIGENVECTORS_CLEANUP); - - outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); + gsl_matrix *outGSL = NULL; + gsl_matrix *inGSL = NULL; + + #define EIGENVECTORS_CLEANUP { psFree(out); return NULL; } + // Error checks + PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, EIGENVECTORS_CLEANUP); + PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, EIGENVECTORS_CLEANUP); + PS_CHECK_POINTERS(in, out, EIGENVECTORS_CLEANUP); + + out = psImageRecycle(out, in->numCols, in->numRows, in->type.type); // Initialize data - numRows = inImage->numRows; - numCols = inImage->numCols; - - in = gsl_matrix_alloc(numRows, numCols); - psImageToGslMatrix(in, inImage); - out = gsl_matrix_alloc(numRows, numCols); + numRows = in->numRows; + numCols = in->numCols; + + inGSL = gsl_matrix_alloc(numRows, numCols); + psImageToGslMatrix(inGSL, in); + outGSL = gsl_matrix_alloc(numRows, numCols); // Allocate GSL structs @@ -511,20 +511,20 @@ // Non-square matrices not allowed - PS_CHECK_SQUARE(inImage, EIGENVECTORS_CLEANUP); - PS_CHECK_SQUARE(outImage, EIGENVECTORS_CLEANUP); + PS_CHECK_SQUARE(in, EIGENVECTORS_CLEANUP); + PS_CHECK_SQUARE(out, EIGENVECTORS_CLEANUP); // Calculate Eigenvalues and Eigenvectors...Eigenvalues not currently used - gsl_eigen_symmv(in, eVals, out, w); + gsl_eigen_symmv(inGSL, eVals, outGSL, w); // Copy GSL matrix data to psImage data - gslMatrixToPsImage(outImage, out); + gslMatrixToPsImage(out, outGSL); // Free GSL structs - gsl_matrix_free(in); - gsl_matrix_free(out); + gsl_matrix_free(inGSL); + gsl_matrix_free(outGSL); gsl_eigen_symmv_free(w); gsl_vector_free(eVals); - return outImage; + return out; } Index: trunk/psLib/src/math/psMatrix.h =================================================================== --- trunk/psLib/src/math/psMatrix.h (revision 4315) +++ trunk/psLib/src/math/psMatrix.h (revision 4321) @@ -21,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-20 22:42:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -76,5 +76,5 @@ psImage* outImage, ///< Image to return, or NULL for in-place substitution. const psImage* inImage, ///< Image to be inverted - psF32 *det ///< Determinant to return, or NULL + float *det ///< Determinant to return, or NULL ); @@ -87,6 +87,6 @@ * @return float: Determinant from psImage. */ -psF32 *psMatrixDeterminant( - const psImage* inMatrix ///< Image used to calculate determinant. +float *psMatrixDeterminant( + const psImage* in ///< Image used to calculate determinant. ); @@ -129,6 +129,6 @@ */ psImage* psMatrixEigenvectors( - psImage* outImage, ///< Eigenvectors to return, or NULL. - psImage* inImage ///< Input image. + psImage* out, ///< Eigenvectors to return, or NULL. + psImage* in ///< Input image. ); Index: trunk/psLib/src/math/psMinimize.c =================================================================== --- trunk/psLib/src/math/psMinimize.c (revision 4315) +++ trunk/psLib/src/math/psMinimize.c (revision 4321) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.122 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-13 20:18:18 $ + * @version $Revision: 1.123 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-20 22:42:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -562,12 +562,12 @@ // XXX EAM this is my re-implementation of MinLM -psBool psMinimizeLMChi2(psMinimization *min, - psImage *covar, - psVector *params, - const psVector *paramMask, - const psArray *x, - const psVector *y, - const psVector *yErr, - psMinimizeLMChi2Func func) +bool psMinimizeLMChi2(psMinimization *min, + psImage *covar, + psVector *params, + const psVector *paramMask, + const psArray *x, + const psVector *y, + const psVector *yErr, + psMinimizeLMChi2Func func) { PS_ASSERT_PTR_NON_NULL(min, NULL); @@ -1426,6 +1426,6 @@ /****************************************************************************** *****************************************************************************/ -psMinimization *psMinimizationAlloc(psS32 maxIter, - psF32 tol) +psMinimization *psMinimizationAlloc(int maxIter, + float tol) { PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL); @@ -1912,9 +1912,9 @@ #define PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE 0.01 -psBool psMinimizePowell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - psMinimizePowellFunc func) +bool psMinimizePowell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + psMinimizePowellFunc func) { PS_ASSERT_PTR_NON_NULL(min, NULL); @@ -2189,16 +2189,16 @@ psMinimizePowell(). *****************************************************************************/ -psBool psMinimizeChi2Powell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - const psVector *value, - const psVector *error, - psMinimizeChi2PowellFunc func) +bool psMinimizeChi2Powell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + const psVector *value, + const psVector *error, + psMinimizeChi2PowellFunc model) { myValue = (psVector *) value; myError = (psVector *) error; - Chi2PowellFunc = func; + Chi2PowellFunc = model; return(psMinimizePowell(min, params, paramMask, coords, myPowellChi2Func)); Index: trunk/psLib/src/math/psMinimize.h =================================================================== --- trunk/psLib/src/math/psMinimize.h (revision 4315) +++ trunk/psLib/src/math/psMinimize.h (revision 4321) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 03:51:58 $ + * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-20 22:42:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,6 +56,6 @@ */ psMinimization *psMinimizationAlloc( - psS32 maxIter, ///< Number of minimization iterations to perform. - psF32 tol ///< Requested error tolerance + int maxIter, ///< Number of minimization iterations to perform. + float tol ///< Requested error tolerance ); @@ -111,5 +111,5 @@ * @return psBool: True if successful. */ -psBool psMinimizeLMChi2( +bool psMinimizeLMChi2( psMinimization *min, ///< Minimization specification psImage *covar, ///< Covariance matrix @@ -167,5 +167,5 @@ * @return psBool: True if successful. */ -psBool psMinimizePowell( +bool psMinimizePowell( psMinimization *min, ///< Minimization specification psVector *params, ///< "Best guess" for parameters that minimize func @@ -211,5 +211,5 @@ * @return psBool: True is successful. */ -psBool psMinimizeChi2Powell( +bool psMinimizeChi2Powell( psMinimization *min, ///< Minimization specification psVector *params, ///< "Best guess" for parameters that minimize func @@ -218,5 +218,5 @@ const psVector *value, ///< Measured values at the coordinates const psVector *error, ///< Errors in the measure values (or NULL) - psMinimizeChi2PowellFunc func ///< Specified function + psMinimizeChi2PowellFunc model ///< Specified function );