Changeset 3715 for trunk/psLib/src/astro/psCoord.c

Timestamp:

Apr 18, 2005, 7:46:24 PM (21 years ago)

Author:

gusciora

Message:

Improved the psTransformFit() tests.

File:

• trunk/psLib/src/astro/psCoord.c (modified) (6 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-19 04:16:02 $
+*  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-19 05:46:24 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
 XXX: Since thre is now a general psPlaneTransformInvert() function, we
 should rename this.
- 
-X1, Y1 = (2, 3)
- 
-    X2 = 1 + 4 + 9   = 14
-    Y2 = 4 + 10 + 18 = 32
- 
-in inverse
- 
-Y1 = (32 - ((5/2) * 14) - 4 + ((5)/2)) / (6 - ((15)/2));
-Y1 = (32 - 35 - 4 + (5/2)) / (6 - 15/2);
-Y1 = (-7 + (5/2)) / (12/2 - 15/2);
-Y1 = (-7 + (5/2)) / (-3/2);
-Y1 = (-14/2 + 5/2) / (-3/2);
-Y1 = (-9/2) / (-3/2);
-Y1 = (9/2) / (3/2);
-Y1 = 3
- 
-X1 = (Y2 - ((F/C) * X2) - D + ((F*A)/C)) / (E - ((F*B)/C));
-X1 = (32 - ((6/3) * 14) - 4 + ((6)/3)) / (5 - ((12)/3));
-X1 = (32 - (2 * 14) - 4 + 2 / (5 - 4);
-X1 = (32 - 28 - 4 + 2) / 1;
-X1 = 2;
- 
  *****************************************************************************/
 psPlaneTransform *p_psPlaneTransformLinearInvert(psPlaneTransform *transform)
@@ -128 +105 @@
     psF64 F = 0.0;
 
-    // XXX: Test this for correctness.
     A = transform->x->coeff[0][0];
     if (transform->x->nX >= 2) {
@@ -144 +120 @@
     }
 
-    // XXX: Use the constructor here.
     psPlaneTransform *out = psPlaneTransformAlloc(2, 2);
 
@@ -877 +852 @@
                 for (psS32 t2x = 0 ; t2x < trans2->nX ; t2x++) {
                     for (psS32 t2y = 0 ; t2y < trans2->nY ; t2y++) {
-                        /* VERIFY MACRO
+                        /* Possible debug-only macro which checks these coords?
                         if ((t1x+t2x) >= orderX)
-                            printf("CRAP 1\n");
+                            printf("BAD 1\n");
                         if ((t1y+t2y) >= orderY)
-                            printf("CRAP 2\n");
+                            printf("BAD 2\n");
                         */
                         out->coeff[t1x+t2x][t1y+t2y]+= (trans1->coeff[t1x][t1y] * trans2->coeff[t2x][t2y]);
@@ -1051 +1026 @@
 
     psS32 numCoords = PS_MIN(source->n, dest->n);
-    // This is not really necessary because of above conditionals.
     psS32 order = PS_MAX(trans->x->nX, trans->x->nY);