Changeset 42822 for trunk/psLib/test/astro
- Timestamp:
- May 8, 2025, 4:42:12 PM (14 months ago)
- Location:
- trunk/psLib/test
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
astro (modified) (1 prop)
-
astro/tap_psCoord.c (modified) (8 diffs)
-
astro/tap_psCoord02.c (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/test
- Property svn:ignore
-
old new 6 6 *.da 7 7 gmon.out 8 test.00.jpg 9 test.01.jpg 10 test.02.jpg 11 test.03.jpg 12 test.04.jpg 13 test.05.jpg 14 test.06.jpg 15 test.07.jpg 16 test.08.jpg 17 test.09.jpg 18 test.10.jpg 19 test.11.jpg 20 test.12.jpg 21 test.im.fits 22 test.mk.fits 23 test.sm1.fits 24 test.sm2.fits 25 test.sm3.fits 26 test.sm4.fits 27 tmpImages 28 tst_psTrace02_OUT
-
- Property svn:ignore
-
trunk/psLib/test/astro
- Property svn:ignore
-
trunk/psLib/test/astro/tap_psCoord.c
r13623 r42822 48 48 { 49 49 psMemId id = psMemGetId(); 50 psPlaneTransform *myPT = psPlaneTransformAlloc(ORDER_X, ORDER_Y );50 psPlaneTransform *myPT = psPlaneTransformAlloc(ORDER_X, ORDER_Y, PS_POLYNOMIAL_ORD); 51 51 ok(myPT != NULL, "psPlaneTransformAlloc() returned non-NULL"); 52 52 skip_start(myPT == NULL, 4, "Skipping tests because psPlaneTransformAlloc() returned NULL"); … … 59 59 // Attempt to specify negative x order and verify NULL returned and 60 60 // errror message generated 61 myPT = psPlaneTransformAlloc(-1, 1 );61 myPT = psPlaneTransformAlloc(-1, 1, PS_POLYNOMIAL_ORD); 62 62 ok(myPT == NULL, "psPlaneTransformAlloc(-1, 1) returned NULL"); 63 63 psFree(myPT); 64 64 65 myPT = psPlaneTransformAlloc(1, -1 );65 myPT = psPlaneTransformAlloc(1, -1, PS_POLYNOMIAL_ORD); 66 66 ok(myPT == NULL, "psPlaneTransformAlloc(1, -1) returned NULL"); 67 67 psFree(myPT); … … 110 110 ok(in != NULL, "psPlaneAlloc() returned non-NULL"); 111 111 skip_start(in == NULL, 2, "Skipping tests because psPlaneAlloc() returned NULL"); 112 psPlaneTransform* pt = psPlaneTransformAlloc(2, 2);112 psPlaneTransform* pt = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD); 113 113 ok(pt != NULL, "psPlaneTransformAlloc() returned non-NULL"); 114 114 skip_start(pt == NULL, 1, "Skipping tests because psPlaneTransformAlloc() returned NULL"); … … 169 169 psMemId id = psMemGetId(); 170 170 psPlane *in = psPlaneAlloc(); 171 psPlaneTransform *pt = psPlaneTransformAlloc(2, 2);171 psPlaneTransform *pt = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD); 172 172 psFree(pt->x); 173 173 pt->x = NULL; … … 184 184 psMemId id = psMemGetId(); 185 185 psPlane* in = psPlaneAlloc(); 186 psPlaneTransform* pt = psPlaneTransformAlloc(2,2 );186 psPlaneTransform* pt = psPlaneTransformAlloc(2,2, PS_POLYNOMIAL_ORD); 187 187 psFree(pt->y); 188 188 pt->y = NULL; … … 198 198 { 199 199 psMemId id = psMemGetId(); 200 psPlaneTransform* pt = psPlaneTransformAlloc(2,2 );200 psPlaneTransform* pt = psPlaneTransformAlloc(2,2, PS_POLYNOMIAL_ORD); 201 201 psPlane *tmpPL = psPlaneTransformApply(NULL, pt, NULL); 202 202 ok(tmpPL == NULL, "psPlaneTransformApply(NULL, pt, NULL) did not return NULL"); … … 314 314 { 315 315 psMemId id = psMemGetId(); 316 psPlaneTransform *trans = psPlaneTransformAlloc(1, 3 );316 psPlaneTransform *trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD); 317 317 psPixels *output = psPixelsTransform(NULL, NULL, trans); 318 318 ok(output == NULL, "psPixelsTransform(NULL, NULL, trans) returned NULL"); … … 342 342 input->data[1].x = 1.0; 343 343 input->data[1].y = 6.0; 344 psPlaneTransform *trans = psPlaneTransformAlloc(1, 3 );344 psPlaneTransform *trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD); 345 345 trans->x->coeff[0][0] = 0; 346 346 trans->x->coeff[1][0] = 1.0; -
trunk/psLib/test/astro/tap_psCoord02.c
r13623 r42822 189 189 for (psS32 t2yy = 0 ; t2yy < TST04_T2_Y_Y ; t2yy++) { 190 190 //printf("(%d %d %d %d %d %d %d %d)\n", t1xx, t1xy, t1yx, t1yy, t2xx, t2xy, t2yx, t2yy); 191 psPlaneTransform *trans1 = psPlaneTransformAlloc(PS_MAX(t1xx, t1yx), PS_MAX(t1xy, t1yy) );192 psPlaneTransform *trans2 = psPlaneTransformAlloc(PS_MAX(t2xx, t2yx), PS_MAX(t2xy, t2yy) );191 psPlaneTransform *trans1 = psPlaneTransformAlloc(PS_MAX(t1xx, t1yx), PS_MAX(t1xy, t1yy), PS_POLYNOMIAL_ORD); 192 psPlaneTransform *trans2 = psPlaneTransformAlloc(PS_MAX(t2xx, t2yx), PS_MAX(t2xy, t2yy), PS_POLYNOMIAL_ORD); 193 193 psPlaneTransform *trans3 = NULL; 194 194 setCoeffs(trans1, trans2); … … 228 228 { 229 229 psMemId id = psMemGetId(); 230 psPlaneTransform *trans2 = psPlaneTransformAlloc(2, 2 );230 psPlaneTransform *trans2 = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD); 231 231 psPlaneTransform *trans3 = psPlaneTransformCombine(NULL, NULL, trans2, psRegionSet(0,0,0,0), 10); 232 232 ok(trans3 == NULL, "psPlaneTransformCombine() returned NULL with NULL trans1 input"); … … 241 241 { 242 242 psMemId id = psMemGetId(); 243 psPlaneTransform *trans1 = psPlaneTransformAlloc(2, 2 );243 psPlaneTransform *trans1 = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD); 244 244 psPlaneTransform *trans3 = psPlaneTransformCombine(NULL, trans1, NULL, psRegionSet(0,0,0,0), 10); 245 245 ok(trans3 == NULL, "psPlaneTransformCombine() returned NULL with NULL trans2 input"); … … 281 281 { 282 282 psMemId id = psMemGetId(); 283 psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER );283 psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD); 284 284 psArray *dst = psArrayAlloc((int) TST05_NUM_DATA); 285 285 ok(!psPlaneTransformFit(trans, NULL, dst, 100, 100.0), "psPlaneTransformFit() returned FALSE with NULL src psArray"); … … 295 295 { 296 296 psMemId id = psMemGetId(); 297 psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER );297 psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD); 298 298 psArray *src = psArrayAlloc((int) TST05_NUM_DATA); 299 299 ok(!psPlaneTransformFit(trans, src, NULL, 100, 100.0), "psPlaneTransformFit() returned FALSE with NULL dst psArray"); … … 309 309 { 310 310 psMemId id = psMemGetId(); 311 psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER );312 psPlaneTransform *transInit = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER );311 psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD); 312 psPlaneTransform *transInit = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD); 313 313 psArray *src = psArrayAlloc((int) TST05_NUM_DATA); 314 314 psArray *dst = psArrayAlloc((int) TST05_NUM_DATA); … … 403 403 psMemId id = psMemGetId(); 404 404 psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0); 405 psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, NULL, myRegion, 10 );405 psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, NULL, myRegion, 10, 2); 406 406 ok(transInverse == NULL, "psPlaneTransformInvert() returned NULL with NULL trans"); 407 407 psFree(transInverse); … … 416 416 { 417 417 psMemId id = psMemGetId(); 418 psPlaneTransform *trans = psPlaneTransformAlloc(1, 1 );418 psPlaneTransform *trans = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD); 419 419 psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0); 420 psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 0 );420 psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 0, 2); 421 421 ok(transInverse == NULL, "psPlaneTransformInvert() returned NULL with zero nSamples"); 422 422 psFree(trans); … … 434 434 psMemId id = psMemGetId(); 435 435 bool errorFlag = false; 436 psPlaneTransform *trans = psPlaneTransformAlloc(1, 1 );436 psPlaneTransform *trans = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD); 437 437 psPlaneTransform *transInverse = NULL; 438 438 psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0); … … 473 473 } 474 474 475 transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 10 );475 transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 10, 2); 476 476 if (transInverse == NULL) { 477 477 diag("TEST ERROR: psPlaneTransformInvert() returned a NULL psPlaneTransform.\n"); … … 514 514 { 515 515 psMemId id = psMemGetId(); 516 psPlaneTransform *trans = psPlaneTransformAlloc(1, 3 );516 psPlaneTransform *trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD); 517 517 psPlane *deriv = psPlaneTransformDeriv(NULL, trans, NULL); 518 518 ok(deriv == NULL, "psPlaneTransformDeriv(NULL, trans, NULL) returned NULL"); … … 532 532 coord->x = 3.0; 533 533 coord->y = 1.0; 534 trans = psPlaneTransformAlloc(1, 3 );534 trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD); 535 535 //Set Polynomials. f(x) = x, f(y) = 0.5*y^2 --> f'(x) = 1, f'(y) = y 536 536 //So for 1,1 -> f'(1) = 1, f'(1) = 1
Note:
See TracChangeset
for help on using the changeset viewer.
