Changeset 42493 for branches/eam_branches/ipp-20230313/psLib/test/astro

Timestamp:

Aug 15, 2023, 4:59:00 AM (3 years ago)

Author:

eugene

Message:

fixing tests so they compile (need to address some API changes to psPlaneTranformAlloc, psImageMapFit; fix unused vars, etc)

Location:

branches/eam_branches/ipp-20230313/psLib/test/astro

Files:

• tap_psCoord.c (modified) (8 diffs)
• tap_psCoord02.c (modified) (12 diffs)

branches/eam_branches/ipp-20230313/psLib/test/astro/tap_psCoord.c

@@ -48 +48 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *myPT = psPlaneTransformAlloc(ORDER_X, ORDER_Y);
+        psPlaneTransform *myPT = psPlaneTransformAlloc(ORDER_X, ORDER_Y, PS_POLYNOMIAL_ORD);
         ok(myPT != NULL, "psPlaneTransformAlloc() returned non-NULL");
         skip_start(myPT == NULL, 4, "Skipping tests because psPlaneTransformAlloc() returned NULL");
@@ -59 +59 @@
         // Attempt to specify negative x order and verify NULL returned and
         // errror message generated
-        myPT = psPlaneTransformAlloc(-1, 1);
+        myPT = psPlaneTransformAlloc(-1, 1, PS_POLYNOMIAL_ORD);
         ok(myPT == NULL, "psPlaneTransformAlloc(-1, 1) returned NULL");
         psFree(myPT);
 
-        myPT = psPlaneTransformAlloc(1, -1);
+        myPT = psPlaneTransformAlloc(1, -1, PS_POLYNOMIAL_ORD);
         ok(myPT == NULL, "psPlaneTransformAlloc(1, -1) returned NULL");
         psFree(myPT);
@@ -110 +110 @@
         ok(in != NULL, "psPlaneAlloc() returned non-NULL");
         skip_start(in == NULL, 2, "Skipping tests because psPlaneAlloc() returned NULL");
-        psPlaneTransform* pt = psPlaneTransformAlloc(2,2);
+        psPlaneTransform* pt = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD);
         ok(pt != NULL, "psPlaneTransformAlloc() returned non-NULL");
         skip_start(pt == NULL, 1, "Skipping tests because psPlaneTransformAlloc() returned NULL");
@@ -169 +169 @@
         psMemId id = psMemGetId();
         psPlane *in = psPlaneAlloc();
-        psPlaneTransform *pt = psPlaneTransformAlloc(2,2);
+        psPlaneTransform *pt = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD);
         psFree(pt->x);
         pt->x = NULL;
@@ -184 +184 @@
         psMemId id = psMemGetId();
         psPlane* in = psPlaneAlloc();
-        psPlaneTransform* pt = psPlaneTransformAlloc(2,2);
+        psPlaneTransform* pt = psPlaneTransformAlloc(2,2, PS_POLYNOMIAL_ORD);
         psFree(pt->y);
         pt->y = NULL;
@@ -198 +198 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform* pt = psPlaneTransformAlloc(2,2);
+        psPlaneTransform* pt = psPlaneTransformAlloc(2,2, PS_POLYNOMIAL_ORD);
         psPlane *tmpPL = psPlaneTransformApply(NULL, pt, NULL);
         ok(tmpPL == NULL, "psPlaneTransformApply(NULL, pt, NULL) did not return NULL");
@@ -314 +314 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans = psPlaneTransformAlloc(1, 3);
+        psPlaneTransform *trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD);
         psPixels *output = psPixelsTransform(NULL, NULL, trans);
         ok(output == NULL, "psPixelsTransform(NULL, NULL, trans) returned NULL");
@@ -342 +342 @@
         input->data[1].x = 1.0;
         input->data[1].y = 6.0;
-        psPlaneTransform *trans = psPlaneTransformAlloc(1, 3);
+        psPlaneTransform *trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD);
         trans->x->coeff[0][0] = 0;
         trans->x->coeff[1][0] = 1.0;

branches/eam_branches/ipp-20230313/psLib/test/astro/tap_psCoord02.c

@@ -189 +189 @@
                                     for (psS32 t2yy = 0 ; t2yy < TST04_T2_Y_Y ; t2yy++) {
                                         //printf("(%d %d %d %d %d %d %d %d)\n", t1xx, t1xy, t1yx, t1yy, t2xx, t2xy, t2yx, t2yy);
-                                        psPlaneTransform *trans1 = psPlaneTransformAlloc(PS_MAX(t1xx, t1yx), PS_MAX(t1xy, t1yy));
-                                        psPlaneTransform *trans2 = psPlaneTransformAlloc(PS_MAX(t2xx, t2yx), PS_MAX(t2xy, t2yy));
+                                        psPlaneTransform *trans1 = psPlaneTransformAlloc(PS_MAX(t1xx, t1yx), PS_MAX(t1xy, t1yy), PS_POLYNOMIAL_ORD);
+                                        psPlaneTransform *trans2 = psPlaneTransformAlloc(PS_MAX(t2xx, t2yx), PS_MAX(t2xy, t2yy), PS_POLYNOMIAL_ORD);
                                         psPlaneTransform *trans3 = NULL;
                                         setCoeffs(trans1, trans2);
@@ -228 +228 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans2 = psPlaneTransformAlloc(2, 2);
+        psPlaneTransform *trans2 = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD);
         psPlaneTransform *trans3 = psPlaneTransformCombine(NULL, NULL, trans2, psRegionSet(0,0,0,0), 10);
         ok(trans3 == NULL, "psPlaneTransformCombine() returned NULL with NULL trans1 input");
@@ -241 +241 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans1 = psPlaneTransformAlloc(2, 2);
+        psPlaneTransform *trans1 = psPlaneTransformAlloc(2, 2, PS_POLYNOMIAL_ORD);
         psPlaneTransform *trans3 = psPlaneTransformCombine(NULL, trans1, NULL, psRegionSet(0,0,0,0), 10);
         ok(trans3 == NULL, "psPlaneTransformCombine() returned NULL with NULL trans2 input");
@@ -281 +281 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER);
+        psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD);
         psArray *dst = psArrayAlloc((int) TST05_NUM_DATA);
         ok(!psPlaneTransformFit(trans, NULL, dst, 100, 100.0), "psPlaneTransformFit() returned FALSE with NULL src psArray");
@@ -295 +295 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER);
+        psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD);
         psArray *src = psArrayAlloc((int) TST05_NUM_DATA);
         ok(!psPlaneTransformFit(trans, src, NULL, 100, 100.0), "psPlaneTransformFit() returned FALSE with NULL dst psArray");
@@ -309 +309 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER);
-        psPlaneTransform *transInit = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER);
+        psPlaneTransform *trans = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD);
+        psPlaneTransform *transInit = psPlaneTransformAlloc(TST05_X_POLY_ORDER, TST05_Y_POLY_ORDER, PS_POLYNOMIAL_ORD);
         psArray *src = psArrayAlloc((int) TST05_NUM_DATA);
         psArray *dst = psArrayAlloc((int) TST05_NUM_DATA);
@@ -403 +403 @@
         psMemId id = psMemGetId();
         psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0);
-        psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, NULL, myRegion, 10);
+        psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, NULL, myRegion, 10, 2);
         ok(transInverse == NULL, "psPlaneTransformInvert() returned NULL with NULL trans");
         psFree(transInverse);
@@ -416 +416 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans = psPlaneTransformAlloc(1, 1);
+        psPlaneTransform *trans = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
         psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0);
-        psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 0);
+        psPlaneTransform *transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 0, 2);
         ok(transInverse == NULL, "psPlaneTransformInvert() returned NULL with zero nSamples");
         psFree(trans);
@@ -434 +434 @@
         psMemId id = psMemGetId();
         bool errorFlag = false;
-        psPlaneTransform *trans = psPlaneTransformAlloc(1, 1);
+        psPlaneTransform *trans = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
         psPlaneTransform *transInverse = NULL;
         psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0);
@@ -473 +473 @@
             }
 
-            transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 10);
+            transInverse = psPlaneTransformInvert(NULL, trans, myRegion, 10, 2);
             if (transInverse == NULL) {
                 diag("TEST ERROR: psPlaneTransformInvert() returned a NULL psPlaneTransform.\n");
@@ -514 +514 @@
     {
         psMemId id = psMemGetId();
-        psPlaneTransform *trans = psPlaneTransformAlloc(1, 3);
+        psPlaneTransform *trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD);
         psPlane *deriv = psPlaneTransformDeriv(NULL, trans, NULL);
         ok(deriv == NULL, "psPlaneTransformDeriv(NULL, trans, NULL) returned NULL");
@@ -532 +532 @@
         coord->x = 3.0;
         coord->y = 1.0;
-        trans = psPlaneTransformAlloc(1, 3);
+        trans = psPlaneTransformAlloc(1, 3, PS_POLYNOMIAL_ORD);
         //Set Polynomials.  f(x) = x, f(y) = 0.5*y^2  -->  f'(x) = 1, f'(y) = y
         //So for 1,1  -> f'(1) = 1, f'(1) = 1