Changeset 3716

Timestamp:

Apr 18, 2005, 9:00:20 PM (21 years ago)

Author:

gusciora

Message:

Slightly nicer way of allocating memory for the coords.

File:

• trunk/psLib/test/astronomy/tst_psAstrometry01.c (modified) (6 diffs)

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-19 05:46:24 $
+*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-19 07:00:20 $
 *
 * XXX: Must test
@@ -693 +693 @@
 
 /******************************************************************************
-test04(): We test psPlaneTransformCombine() with a wariety of input
+test04(): We test psPlaneTransformCombine() with a variety of input
 transforms, as well as input coordinates, as well as erroneous input
 parameters.
@@ -780 +780 @@
 /******************************************************************************
 XXX: This is only a rudimentary test of the psPlaneTransformFit() function.
-It tests a few NULL input parameter conditions.
- 
-XXX: We call it with acceptable data, but we do not verify the output.
+It tests a few NULL input parameter conditions, and some simple linear
+transformations.
  *****************************************************************************/
 psS32 test5( void )
@@ -793 +792 @@
     bool rc;
 
-
     //
     // We set an arbitrary non-linear transformation.
     //
-
     for (psS32 x = 0 ; x < TST05_X_POLY_ORDER ; x++) {
         for (psS32 y = 0 ; y < TST05_Y_POLY_ORDER ; y++) {
@@ -824 +821 @@
     //
     // We generate a grid of input data points in the x1,y1 plane, calculate the
-    // corresponding valuesin the x2,y2 in the transformed plane, and set these to
+    // corresponding values in the transformed plane, and set these to
     // the src and dst psVectors.
     //
-    psPlane *inData = psPlaneAlloc();
-    psPlane *outData = NULL;
     psS32 i = 0;
-    for (inData->x = TST05_X_MIN ; inData->x < TST05_X_MAX ; inData->x+= (TST05_X_MAX-TST05_X_MIN)/TST05_NUM_X) {
-        for (inData->y = TST05_Y_MIN ; inData->y < TST05_Y_MAX ; inData->y+= (TST05_Y_MAX-TST05_Y_MIN)/TST05_NUM_Y) {
+    for (psF32 x = TST05_X_MIN ; x < TST05_X_MAX ; x+= (TST05_X_MAX-TST05_X_MIN)/TST05_NUM_X) {
+        for (psF32 y = TST05_Y_MIN ; y < TST05_Y_MAX ; y+= (TST05_Y_MAX-TST05_Y_MIN)/TST05_NUM_Y) {
             src->data[i] = (psPtr *) psPlaneAlloc();
-            dst->data[i] = (psPtr *) psPlaneAlloc();
-
-            ((psPlane *) src->data[i])->x = inData->x;
-            ((psPlane *) src->data[i])->y = inData->y;
-
-            outData = psPlaneTransformApply(NULL, transInit, inData);
-
-            ((psPlane *) dst->data[i])->x = outData->x;
-            ((psPlane *) dst->data[i])->y = outData->y;
-            psFree(outData);
-
+            ((psPlane *) src->data[i])->x = x;
+            ((psPlane *) src->data[i])->y = y;
+
+            dst->data[i] = psPlaneTransformApply(NULL, transInit, ((psPlane *) src->data[i]));
             i++;
         }
     }
-    psFree(inData);
 
     printf("----------------------------------------------------------------------------------\n");
@@ -909 +896 @@
     psFree(src);
     psFree(dst);
+
     return(!testStatus);
 }