Changeset 3714 for trunk/psLib/src/astronomy/psCoord.c

Timestamp:

Apr 18, 2005, 6:16:02 PM (21 years ago)

Author:

gusciora

Message:

Created tests for inverting linear psPlaneTransforms. Fixed a bug with the
linear transform inversion code.

File:

• trunk/psLib/src/astronomy/psCoord.c (modified) (4 diffs)

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-19 01:22:59 $
+*  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-19 04:16:02 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -84 +84 @@
  X1 = (-D + ((F*A)/C)) / (E - ((F*B)/C)) +
       (X2 * -((F/C) / (E - ((F*B)/C)))) +
-             (Y2 * (1.0 / (E - ((F*B)/C))));
-        Y1 = (-D + ((E*A)/B))/(F - ((C*E)/B)) +
-             (X2 * -((E/B) / (F - ((C*E)/B)))) +
-             (Y2 * (1.0 / (F - ((C*E)/B))));
+      (Y2 * (1.0 / (E - ((F*B)/C))));
+ Y1 = (-D + ((E*A)/B))/(F - ((C*E)/B)) +
+      (X2 * -((E/B) / (F - ((C*E)/B)))) +
+      (Y2 * (1.0 / (F - ((C*E)/B))));
  
 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;
  
  *****************************************************************************/
@@ -125 +147 @@
     psPlaneTransform *out = psPlaneTransformAlloc(2, 2);
 
-    out->x->coeff[0][0] = -D + ((F*A)/C) / (E - ((F*B)/C));
+    out->x->coeff[0][0] = (-D + ((F*A)/C)) / (E - ((F*B)/C));
     out->x->coeff[1][0] = -(F/C) / (E - ((F*B)/C));
     out->x->coeff[0][1] =  1.0 / (E - ((F*B)/C));
-    out->y->coeff[0][0] = -D + ((E*A)/B) / (F - ((C*E)/B));
+    out->y->coeff[0][0] = (-D + ((E*A)/B)) / (F - ((C*E)/B));
     out->y->coeff[1][0] = -(E/B) / (F - ((C*E)/B));
     out->y->coeff[0][1] =  1.0 / (F - ((C*E)/B));
@@ -1140 +1162 @@
     //
     if (p_psIsProjectionLinear((psPlaneTransform *) in)) {
-        printf("COOL: is linear\n");
         return(p_psPlaneTransformLinearInvert((psPlaneTransform *) in));
     }