Changeset 2214
- Timestamp:
- Oct 27, 2004, 10:20:11 AM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 7 edited
-
astronomy/psAstrometry.c (modified) (2 diffs)
-
dataManip/psConstants.h (modified) (12 diffs)
-
dataManip/psMatrix.c (modified) (15 diffs)
-
dataManip/psMinimize.c (modified) (4 diffs)
-
math/psConstants.h (modified) (12 diffs)
-
math/psMatrix.c (modified) (15 diffs)
-
math/psMinimize.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astronomy/psAstrometry.c
r2212 r2214 8 8 * @author George Gusciora, MHPCC 9 9 * 10 * @version $Revision: 1.4 6$ $Name: not supported by cvs2svn $11 * @date $Date: 2004-10-27 20: 07:17$10 * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2004-10-27 20:20:11 $ 12 12 * 13 13 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 229 229 psS32 j; 230 230 231 PS_ CHECK_NULL_IMAGE(x, NULL);232 PS_ CHECK_NULL_IMAGE(y, NULL);233 PS_ CHECK_IMAGE_TYPE(x, PS_TYPE_F64, NULL);234 PS_ CHECK_IMAGE_TYPE(y, PS_TYPE_F64, NULL);231 PS_IMAGE_CHECK_NULL(x, NULL); 232 PS_IMAGE_CHECK_NULL(y, NULL); 233 PS_IMAGE_CHECK_TYPE(x, PS_TYPE_F64, NULL); 234 PS_IMAGE_CHECK_TYPE(y, PS_TYPE_F64, NULL); 235 235 236 236 tmp = (psFixedPattern *) psAlloc(sizeof(psFixedPattern)); -
trunk/psLib/src/dataManip/psConstants.h
r2213 r2214 6 6 * @author GLG, MHPCC 7 7 * 8 * @version $Revision: 1.2 1$ $Name: not supported by cvs2svn $9 * @date $Date: 2004-10-27 20: 11:46$8 * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2004-10-27 20:20:11 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 109 109 return(RVAL); \ 110 110 } 111 /***************************************************************************** 112 111 112 113 /***************************************************************************** 114 Macros which take a psVector type and determine if it is NULL, or has the 115 wrong type. 113 116 *****************************************************************************/ 114 117 #define PS_VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \ … … 118 121 } \ 119 122 120 /** Preprocessor macro to generate error on an incorrect type */121 123 #define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \ 122 124 if (NAME->type.type != TYPE) { \ … … 125 127 } 126 128 127 /** Preprocessor macro to generate error on a NULL vector */ 128 #define PS_VECTOR_CHEC_NULL(NAME, RVAL) \ 129 #define PS_VECTOR_CHECK_NULL(NAME, RVAL) \ 129 130 if (NAME == NULL || NAME->data.V == NULL) { \ 130 131 psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \ … … 132 133 } \ 133 134 134 /** Preprocessor macro to generate error for zero length vector */135 135 #define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \ 136 136 if (NAME->n < 1) { \ … … 139 139 } \ 140 140 141 /** Preprocessor macro to generate error on differing size vectors */142 141 #define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \ 143 142 if (VEC1->n != VEC2->n) { \ … … 145 144 return(RVAL); \ 146 145 } 147 148 #define PS_VECTOR_PRINT(NAME) \149 for (int my_i=0;my_i<NAME->n;my_i++) { \150 printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \151 } \152 printf("\n"); \153 146 154 147 #define PS_VECTOR_F64_TO_F32(X64, X32) \ … … 164 157 } \ 165 158 159 #define PS_VECTOR_PRINT(NAME) \ 160 for (int my_i=0;my_i<NAME->n;my_i++) { \ 161 printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \ 162 } \ 163 printf("\n"); \ 166 164 167 165 … … 169 167 170 168 *****************************************************************************/ 171 #define PS_ CHECK_NULL_POLY(NAME, NULL) \169 #define PS_POLY_CHECK_NULL(NAME, NULL) \ 172 170 if (NAME == NULL || NAME->coeff == NULL) { \ 173 171 psError(__func__,"Unallowable operation: polynomial %s or its coeffs is NULL.", #NAME); \ … … 175 173 } \ 176 174 177 178 179 180 181 175 /***************************************************************************** 182 176 183 177 *****************************************************************************/ 184 /** Preprocessor macro to generate error on a NULL image */ 185 #define PS_CHECK_NULL_IMAGE(NAME, RVAL) \ 178 #define PS_IMAGE_CHECK_NULL(NAME, RVAL) \ 186 179 if (NAME == NULL || NAME->data.V == NULL) { \ 187 180 psError(__func__,"Unallowable operation: psImage %s or its data is NULL.", #NAME); \ … … 189 182 } 190 183 191 /** Preprocessor macro to generate error for zero length rows or columns */ 192 #define PS_CHECK_EMPTY_IMAGE(NAME, RVAL) \ 184 #define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) \ 193 185 if (NAME->numCols < 1 || NAME->numRows < 1) { \ 194 186 psError(__func__,"Unallowable operation: psImage %s has zero rows or columns (%dx%d).", #NAME, \ … … 197 189 } 198 190 199 #define PS_ CHECK_IMAGE_TYPE(NAME, TYPE, RVAL) \191 #define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \ 200 192 if (NAME->type.type != TYPE) { \ 201 193 psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \ 202 194 return(RVAL); \ 203 195 } 204 205 196 /***************************************************************************** 206 197 207 198 *****************************************************************************/ 208 199 /** Preprocessor macro to generate error on a NULL image */ 209 #define PS_ CHECK_NULL_IMAGE_READOUT(NAME, RVAL) \210 if (NAME == NULL || NAME->image == NULL) { 200 #define PS_READOUT_CHECK_NULL(NAME, RVAL) \ 201 if (NAME == NULL || NAME->image == NULL) { \ 211 202 psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \ 212 203 return(RVAL); \ -
trunk/psLib/src/dataManip/psMatrix.c
r2213 r2214 20 20 * @author Ross Harman, MHPCC 21 21 * 22 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $23 * @date $Date: 2004-10-27 20: 11:47$22 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 23 * @date $Date: 2004-10-27 20:20:11 $ 24 24 * 25 25 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 42 42 43 43 /** Preprocessor macro to generate error a NULL image */ 44 #define PS_VECTOR_CHEC _NULL(NAME, RETURN) \44 #define PS_VECTOR_CHECK_NULL(NAME, RETURN) \ 45 45 if (NAME == NULL || NAME->data.V == NULL) { \ 46 46 psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \ … … 62 62 63 63 /** Preprocessor macro to generate error a NULL image */ 64 #define PS_ CHECK_NULL_IMAGE(NAME, RETURN) \64 #define PS_IMAGE_CHECK_NULL(NAME, RETURN) \ 65 65 if (NAME == NULL || NAME->data.V == NULL) { \ 66 66 psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \ … … 128 128 // Error checks 129 129 PS_CHECK_POINTERS(inImage, outImage, outImage); 130 PS_ CHECK_NULL_IMAGE(inImage, outImage);130 PS_IMAGE_CHECK_NULL(inImage, outImage); 131 131 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 132 132 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 135 135 PS_CHECK_SIZE_IMAGE(outImage, outImage); 136 136 PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type); 137 PS_VECTOR_CHEC _NULL(outPerm, outImage);137 PS_VECTOR_CHECK_NULL(outPerm, outImage); 138 138 PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage); 139 139 … … 177 177 PS_CHECK_POINTERS(inVector, inPerm, outVector); 178 178 PS_CHECK_POINTERS(outVector, inPerm, outVector); 179 PS_ CHECK_NULL_IMAGE(inImage, outVector);179 PS_IMAGE_CHECK_NULL(inImage, outVector); 180 180 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector); 181 181 PS_CHECK_SIZE_IMAGE(inImage, outVector); 182 182 PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type); 183 PS_VECTOR_CHEC _NULL(outVector, outVector);183 PS_VECTOR_CHECK_NULL(outVector, outVector); 184 184 PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector); 185 PS_VECTOR_CHEC _NULL(inVector, outVector);185 PS_VECTOR_CHECK_NULL(inVector, outVector); 186 186 PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector); 187 PS_VECTOR_CHEC _NULL(inPerm, outVector);187 PS_VECTOR_CHECK_NULL(inPerm, outVector); 188 188 PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector); 189 189 … … 231 231 } 232 232 PS_CHECK_POINTERS(inImage, outImage, outImage); 233 PS_ CHECK_NULL_IMAGE(inImage, outImage);233 PS_IMAGE_CHECK_NULL(inImage, outImage); 234 234 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 235 235 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 280 280 281 281 // Error checks 282 PS_ CHECK_NULL_IMAGE(inImage, NULL);282 PS_IMAGE_CHECK_NULL(inImage, NULL); 283 283 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, NULL); 284 284 PS_CHECK_SIZE_IMAGE(inImage, NULL); … … 323 323 PS_CHECK_POINTERS(inImage1, outImage, outImage); 324 324 PS_CHECK_POINTERS(inImage1, inImage2, outImage); 325 PS_ CHECK_NULL_IMAGE(inImage1, outImage);325 PS_IMAGE_CHECK_NULL(inImage1, outImage); 326 326 PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage); 327 327 PS_CHECK_SIZE_IMAGE(inImage1, outImage); 328 PS_ CHECK_NULL_IMAGE(inImage2, outImage);328 PS_IMAGE_CHECK_NULL(inImage2, outImage); 329 329 PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, outImage); 330 330 PS_CHECK_SIZE_IMAGE(inImage2, outImage); … … 362 362 // Error checks 363 363 PS_CHECK_POINTERS(inImage, outImage, outImage); 364 PS_ CHECK_NULL_IMAGE(inImage, outImage);364 PS_IMAGE_CHECK_NULL(inImage, outImage); 365 365 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 366 366 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 401 401 // Error checks 402 402 PS_CHECK_POINTERS(inImage, outImage, outImage); 403 PS_ CHECK_NULL_IMAGE(inImage, outImage);403 PS_IMAGE_CHECK_NULL(inImage, outImage); 404 404 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 405 405 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 439 439 440 440 // Error checks 441 PS_ CHECK_NULL_IMAGE(inImage, outVector);441 PS_IMAGE_CHECK_NULL(inImage, outVector); 442 442 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector); 443 443 PS_CHECK_SIZE_IMAGE(inImage, outVector); … … 456 456 } 457 457 458 PS_VECTOR_CHEC _NULL(outVector, outVector);458 PS_VECTOR_CHECK_NULL(outVector, outVector); 459 459 460 460 // More checks … … 498 498 499 499 // Error checks 500 PS_VECTOR_CHEC _NULL(inVector, outImage);500 PS_VECTOR_CHECK_NULL(inVector, outImage); 501 501 502 502 if (inVector->type.dimen == PS_DIMEN_VECTOR) { … … 531 531 } 532 532 533 PS_ CHECK_NULL_IMAGE(outImage, outImage);533 PS_IMAGE_CHECK_NULL(outImage, outImage); 534 534 PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, outImage); 535 535 -
trunk/psLib/src/dataManip/psMinimize.c
r2213 r2214 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.6 7$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10-27 20: 11:47$11 * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-27 20:20:11 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 426 426 { 427 427 PS_PTR_CHECK_NULL(min, NULL); 428 PS_VECTOR_CHEC _NULL(params, NULL);428 PS_VECTOR_CHECK_NULL(params, NULL); 429 429 PS_VECTOR_CHECK_EMPTY(params, NULL); 430 430 PS_PTR_CHECK_NULL(x, NULL); 431 PS_VECTOR_CHEC _NULL(y, NULL);431 PS_VECTOR_CHECK_NULL(y, NULL); 432 432 PS_VECTOR_CHECK_EMPTY(y, NULL); 433 433 PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL); … … 855 855 psS32 i; 856 856 psPolynomial1D *tmpPoly; 857 PS_ CHECK_NULL_POLY(myPoly, NULL);858 PS_VECTOR_CHEC _NULL(y, NULL);857 PS_POLY_CHECK_NULL(myPoly, NULL); 858 PS_VECTOR_CHECK_NULL(y, NULL); 859 859 PS_VECTOR_CHECK_EMPTY(y, NULL); 860 860 psVector *x64 = NULL; … … 1319 1319 psMinimizePowellFunc func) 1320 1320 { 1321 PS_VECTOR_CHEC _NULL(params, NULL);1321 PS_VECTOR_CHECK_NULL(params, NULL); 1322 1322 PS_VECTOR_CHECK_EMPTY(params, NULL); 1323 1323 PS_PTR_CHECK_NULL(min, NULL); -
trunk/psLib/src/math/psConstants.h
r2213 r2214 6 6 * @author GLG, MHPCC 7 7 * 8 * @version $Revision: 1.2 1$ $Name: not supported by cvs2svn $9 * @date $Date: 2004-10-27 20: 11:46$8 * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2004-10-27 20:20:11 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 109 109 return(RVAL); \ 110 110 } 111 /***************************************************************************** 112 111 112 113 /***************************************************************************** 114 Macros which take a psVector type and determine if it is NULL, or has the 115 wrong type. 113 116 *****************************************************************************/ 114 117 #define PS_VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \ … … 118 121 } \ 119 122 120 /** Preprocessor macro to generate error on an incorrect type */121 123 #define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \ 122 124 if (NAME->type.type != TYPE) { \ … … 125 127 } 126 128 127 /** Preprocessor macro to generate error on a NULL vector */ 128 #define PS_VECTOR_CHEC_NULL(NAME, RVAL) \ 129 #define PS_VECTOR_CHECK_NULL(NAME, RVAL) \ 129 130 if (NAME == NULL || NAME->data.V == NULL) { \ 130 131 psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \ … … 132 133 } \ 133 134 134 /** Preprocessor macro to generate error for zero length vector */135 135 #define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \ 136 136 if (NAME->n < 1) { \ … … 139 139 } \ 140 140 141 /** Preprocessor macro to generate error on differing size vectors */142 141 #define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \ 143 142 if (VEC1->n != VEC2->n) { \ … … 145 144 return(RVAL); \ 146 145 } 147 148 #define PS_VECTOR_PRINT(NAME) \149 for (int my_i=0;my_i<NAME->n;my_i++) { \150 printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \151 } \152 printf("\n"); \153 146 154 147 #define PS_VECTOR_F64_TO_F32(X64, X32) \ … … 164 157 } \ 165 158 159 #define PS_VECTOR_PRINT(NAME) \ 160 for (int my_i=0;my_i<NAME->n;my_i++) { \ 161 printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \ 162 } \ 163 printf("\n"); \ 166 164 167 165 … … 169 167 170 168 *****************************************************************************/ 171 #define PS_ CHECK_NULL_POLY(NAME, NULL) \169 #define PS_POLY_CHECK_NULL(NAME, NULL) \ 172 170 if (NAME == NULL || NAME->coeff == NULL) { \ 173 171 psError(__func__,"Unallowable operation: polynomial %s or its coeffs is NULL.", #NAME); \ … … 175 173 } \ 176 174 177 178 179 180 181 175 /***************************************************************************** 182 176 183 177 *****************************************************************************/ 184 /** Preprocessor macro to generate error on a NULL image */ 185 #define PS_CHECK_NULL_IMAGE(NAME, RVAL) \ 178 #define PS_IMAGE_CHECK_NULL(NAME, RVAL) \ 186 179 if (NAME == NULL || NAME->data.V == NULL) { \ 187 180 psError(__func__,"Unallowable operation: psImage %s or its data is NULL.", #NAME); \ … … 189 182 } 190 183 191 /** Preprocessor macro to generate error for zero length rows or columns */ 192 #define PS_CHECK_EMPTY_IMAGE(NAME, RVAL) \ 184 #define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) \ 193 185 if (NAME->numCols < 1 || NAME->numRows < 1) { \ 194 186 psError(__func__,"Unallowable operation: psImage %s has zero rows or columns (%dx%d).", #NAME, \ … … 197 189 } 198 190 199 #define PS_ CHECK_IMAGE_TYPE(NAME, TYPE, RVAL) \191 #define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \ 200 192 if (NAME->type.type != TYPE) { \ 201 193 psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \ 202 194 return(RVAL); \ 203 195 } 204 205 196 /***************************************************************************** 206 197 207 198 *****************************************************************************/ 208 199 /** Preprocessor macro to generate error on a NULL image */ 209 #define PS_ CHECK_NULL_IMAGE_READOUT(NAME, RVAL) \210 if (NAME == NULL || NAME->image == NULL) { 200 #define PS_READOUT_CHECK_NULL(NAME, RVAL) \ 201 if (NAME == NULL || NAME->image == NULL) { \ 211 202 psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \ 212 203 return(RVAL); \ -
trunk/psLib/src/math/psMatrix.c
r2213 r2214 20 20 * @author Ross Harman, MHPCC 21 21 * 22 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $23 * @date $Date: 2004-10-27 20: 11:47$22 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 23 * @date $Date: 2004-10-27 20:20:11 $ 24 24 * 25 25 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 42 42 43 43 /** Preprocessor macro to generate error a NULL image */ 44 #define PS_VECTOR_CHEC _NULL(NAME, RETURN) \44 #define PS_VECTOR_CHECK_NULL(NAME, RETURN) \ 45 45 if (NAME == NULL || NAME->data.V == NULL) { \ 46 46 psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \ … … 62 62 63 63 /** Preprocessor macro to generate error a NULL image */ 64 #define PS_ CHECK_NULL_IMAGE(NAME, RETURN) \64 #define PS_IMAGE_CHECK_NULL(NAME, RETURN) \ 65 65 if (NAME == NULL || NAME->data.V == NULL) { \ 66 66 psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \ … … 128 128 // Error checks 129 129 PS_CHECK_POINTERS(inImage, outImage, outImage); 130 PS_ CHECK_NULL_IMAGE(inImage, outImage);130 PS_IMAGE_CHECK_NULL(inImage, outImage); 131 131 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 132 132 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 135 135 PS_CHECK_SIZE_IMAGE(outImage, outImage); 136 136 PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type); 137 PS_VECTOR_CHEC _NULL(outPerm, outImage);137 PS_VECTOR_CHECK_NULL(outPerm, outImage); 138 138 PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage); 139 139 … … 177 177 PS_CHECK_POINTERS(inVector, inPerm, outVector); 178 178 PS_CHECK_POINTERS(outVector, inPerm, outVector); 179 PS_ CHECK_NULL_IMAGE(inImage, outVector);179 PS_IMAGE_CHECK_NULL(inImage, outVector); 180 180 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector); 181 181 PS_CHECK_SIZE_IMAGE(inImage, outVector); 182 182 PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type); 183 PS_VECTOR_CHEC _NULL(outVector, outVector);183 PS_VECTOR_CHECK_NULL(outVector, outVector); 184 184 PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector); 185 PS_VECTOR_CHEC _NULL(inVector, outVector);185 PS_VECTOR_CHECK_NULL(inVector, outVector); 186 186 PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector); 187 PS_VECTOR_CHEC _NULL(inPerm, outVector);187 PS_VECTOR_CHECK_NULL(inPerm, outVector); 188 188 PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector); 189 189 … … 231 231 } 232 232 PS_CHECK_POINTERS(inImage, outImage, outImage); 233 PS_ CHECK_NULL_IMAGE(inImage, outImage);233 PS_IMAGE_CHECK_NULL(inImage, outImage); 234 234 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 235 235 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 280 280 281 281 // Error checks 282 PS_ CHECK_NULL_IMAGE(inImage, NULL);282 PS_IMAGE_CHECK_NULL(inImage, NULL); 283 283 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, NULL); 284 284 PS_CHECK_SIZE_IMAGE(inImage, NULL); … … 323 323 PS_CHECK_POINTERS(inImage1, outImage, outImage); 324 324 PS_CHECK_POINTERS(inImage1, inImage2, outImage); 325 PS_ CHECK_NULL_IMAGE(inImage1, outImage);325 PS_IMAGE_CHECK_NULL(inImage1, outImage); 326 326 PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage); 327 327 PS_CHECK_SIZE_IMAGE(inImage1, outImage); 328 PS_ CHECK_NULL_IMAGE(inImage2, outImage);328 PS_IMAGE_CHECK_NULL(inImage2, outImage); 329 329 PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, outImage); 330 330 PS_CHECK_SIZE_IMAGE(inImage2, outImage); … … 362 362 // Error checks 363 363 PS_CHECK_POINTERS(inImage, outImage, outImage); 364 PS_ CHECK_NULL_IMAGE(inImage, outImage);364 PS_IMAGE_CHECK_NULL(inImage, outImage); 365 365 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 366 366 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 401 401 // Error checks 402 402 PS_CHECK_POINTERS(inImage, outImage, outImage); 403 PS_ CHECK_NULL_IMAGE(inImage, outImage);403 PS_IMAGE_CHECK_NULL(inImage, outImage); 404 404 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage); 405 405 PS_CHECK_SIZE_IMAGE(inImage, outImage); … … 439 439 440 440 // Error checks 441 PS_ CHECK_NULL_IMAGE(inImage, outVector);441 PS_IMAGE_CHECK_NULL(inImage, outVector); 442 442 PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector); 443 443 PS_CHECK_SIZE_IMAGE(inImage, outVector); … … 456 456 } 457 457 458 PS_VECTOR_CHEC _NULL(outVector, outVector);458 PS_VECTOR_CHECK_NULL(outVector, outVector); 459 459 460 460 // More checks … … 498 498 499 499 // Error checks 500 PS_VECTOR_CHEC _NULL(inVector, outImage);500 PS_VECTOR_CHECK_NULL(inVector, outImage); 501 501 502 502 if (inVector->type.dimen == PS_DIMEN_VECTOR) { … … 531 531 } 532 532 533 PS_ CHECK_NULL_IMAGE(outImage, outImage);533 PS_IMAGE_CHECK_NULL(outImage, outImage); 534 534 PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, outImage); 535 535 -
trunk/psLib/src/math/psMinimize.c
r2213 r2214 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.6 7$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10-27 20: 11:47$11 * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-27 20:20:11 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 426 426 { 427 427 PS_PTR_CHECK_NULL(min, NULL); 428 PS_VECTOR_CHEC _NULL(params, NULL);428 PS_VECTOR_CHECK_NULL(params, NULL); 429 429 PS_VECTOR_CHECK_EMPTY(params, NULL); 430 430 PS_PTR_CHECK_NULL(x, NULL); 431 PS_VECTOR_CHEC _NULL(y, NULL);431 PS_VECTOR_CHECK_NULL(y, NULL); 432 432 PS_VECTOR_CHECK_EMPTY(y, NULL); 433 433 PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL); … … 855 855 psS32 i; 856 856 psPolynomial1D *tmpPoly; 857 PS_ CHECK_NULL_POLY(myPoly, NULL);858 PS_VECTOR_CHEC _NULL(y, NULL);857 PS_POLY_CHECK_NULL(myPoly, NULL); 858 PS_VECTOR_CHECK_NULL(y, NULL); 859 859 PS_VECTOR_CHECK_EMPTY(y, NULL); 860 860 psVector *x64 = NULL; … … 1319 1319 psMinimizePowellFunc func) 1320 1320 { 1321 PS_VECTOR_CHEC _NULL(params, NULL);1321 PS_VECTOR_CHECK_NULL(params, NULL); 1322 1322 PS_VECTOR_CHECK_EMPTY(params, NULL); 1323 1323 PS_PTR_CHECK_NULL(min, NULL);
Note:
See TracChangeset
for help on using the changeset viewer.
