Changeset 831 for trunk/psLib/test/dataManip/tst_psMatrix03.c

Timestamp:

Jun 2, 2004, 1:29:39 PM (22 years ago)

Author:

harman

Message:

Changed psVector to be consistent with psImage

File:

• trunk/psLib/test/dataManip/tst_psMatrix03.c (modified) (4 diffs)

trunk/psLib/test/dataManip/tst_psMatrix03.c

@@ -11 +11 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-05-28 02:52:23 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-02 23:29:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 #define PRINT_VECTOR(VECTOR)                        \
 for(int i=0; i<VECTOR->n; i++) {               \
-    printf("%f\n", VECTOR->vec.d[i]);          \
+    printf("%f\n", VECTOR->data.F64[i]);          \
 }
 
@@ -48 +48 @@
     printPositiveTestHeader(stdout, "psMatrix", "Create input and output images and vectors");
     luImage = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
-    perm = (psVector*)psVectorAlloc(PS_TYPE_F64, 3);
-    outVector = (psVector*)psVectorAlloc(PS_TYPE_F64, 3);
-    inVector = (psVector*)psVectorAlloc(PS_TYPE_F64, 3);
+    perm = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+    outVector = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+    inVector = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
     inImage = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
     inImage->data.F64[0][0] =  2;
@@ -61 +61 @@
     inImage->data.F64[2][1] =  1;
     inImage->data.F64[2][2] = -2;
-    inVector->vec.d[0] = 18.0;
-    inVector->vec.d[1] = 24.0;
-    inVector->vec.d[2] =  4.0;
+    inVector->data.F64[0] = 18.0;
+    inVector->data.F64[1] = 24.0;
+    inVector->data.F64[2] =  4.0;
     inVector->n = 3;
     PRINT_MATRIX(inImage);