Changeset 3539

Timestamp:

Mar 29, 2005, 9:41:38 AM (21 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/test/astronomy

Files:

• Makefile.am (modified) (1 diff)
• tst_psAstrometry01.c (modified) (4 diffs)

trunk/psLib/test/astronomy/Makefile.am

@@ -28 +28 @@
          tst_psMetadata_06 \
          tst_psMetadata_07 \
-         tst_psAstrometry \
          tst_psCoord \
          tst_psCoord01 \
-         tst_psAstrometry01
+         tst_psAstrometry \
+         tst_psAstrometry01 \
 
 check_PROGRAMS =$(TESTS)

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 19:41:38 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
 static psS32 test2( void );
 static psS32 test3( void );
+static psS32 test4( void );
 
 testDescription tests[] = {
@@ -22 +23 @@
                               {test2, -2, "Tests psGrommitAlloc()", 0, false},
                               {test3, -3, "MISC", 0, false},
+                              {test4, -1, "psPlaneTransformCombineTmp()", 0, false},
                               {NULL}
                           };
@@ -537 +539 @@
     return(0);
 }
+
+int printTrans(psPlaneTransform *trans)
+{
+    printf("-------------------- trans->x coeffs --------------------\n");
+    for (psS32 i = 0 ; i < trans->x->nX ; i++) {
+        for (psS32 j = 0 ; j < trans->x->nY ; j++) {
+            printf("(%.1f) ", trans->x->coeff[i][j]);
+        }
+        printf("\n");
+    }
+    printf("-------------------- trans->y coeffs --------------------\n");
+    for (psS32 i = 0 ; i < trans->y->nX ; i++) {
+        for (psS32 j = 0 ; j < trans->y->nY ; j++) {
+            printf("(%.1f) ", trans->y->coeff[i][j]);
+        }
+        printf("\n");
+    }
+    return(0);
+}
+
+// XXX: This function must verify the outputs.
+psS32 test4( void )
+{
+    psPlaneTransform *trans1 = psPlaneTransformAlloc(2, 2);
+    psPlaneTransform *trans2 = psPlaneTransformAlloc(2, 2);
+
+    printf("trans1: x = x+y, y = x+y\n");
+    trans1->x->coeff[0][0] = 0.0;
+    trans1->x->coeff[0][1] = 1.0;
+    trans1->x->coeff[1][0] = 1.0;
+    trans1->x->coeff[1][1] = 0;
+    trans1->y->coeff[0][0] = 0.0;
+    trans1->y->coeff[0][1] = 1.0;
+    trans1->y->coeff[1][0] = 1.0;
+    trans1->y->coeff[1][1] = 0;
+    printTrans(trans1);
+
+    printf("trans2: x = x+y, y = x+y\n");
+    trans2->x->coeff[0][0] = 0.0;
+    trans2->x->coeff[0][1] = 1.0;
+    trans2->x->coeff[1][0] = 1.0;
+    trans2->x->coeff[1][1] = 0;
+    trans2->y->coeff[0][0] = 0.0;
+    trans2->y->coeff[0][1] = 1.0;
+    trans2->y->coeff[1][0] = 1.0;
+    trans2->y->coeff[1][1] = 0;
+    printTrans(trans2);
+
+    printf("trans2: x = xy, y = xy\n");
+    trans2->x->coeff[0][0] = 0.0;
+    trans2->x->coeff[0][1] = 0.0;
+    trans2->x->coeff[1][0] = 0.0;
+    trans2->x->coeff[1][1] = 1.0;
+    trans2->y->coeff[0][0] = 0.0;
+    trans2->y->coeff[0][1] = 0.0;
+    trans2->y->coeff[1][0] = 0.0;
+    trans2->y->coeff[1][1] = 1.0;
+    printTrans(trans2);
+
+
+
+    psPlaneTransform *trans3 = psPlaneTransformCombine(NULL, trans1, trans2);
+
+    printf("trans3: \n");
+    printTrans(trans3);
+    psFree(trans1);
+    psFree(trans2);
+    psFree(trans3);
+    return(0);
+}
 //This code is