Changeset 831 for trunk/psLib/test/dataManip/tst_psMatrix07.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_psMatrix07.c (modified) (3 diffs)

trunk/psLib/test/dataManip/tst_psMatrix07.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]);          \
 }
 
@@ -46 +46 @@
     // Test A - Create input and output images
     printPositiveTestHeader(stdout, "psMatrix", "Create input and output images and vectors");
-    v1 = (psVector*)psVectorAlloc(PS_TYPE_F64, 3);
+    v1 = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
     m1 = (psImage*)psImageAlloc(1, 3, PS_TYPE_F64);
-    v2 = (psVector*)psVectorAlloc(PS_TYPE_F64, 3);
+    v2 = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
     m2 = (psImage*)psImageAlloc(1, 3, PS_TYPE_F64);
     m1->data.F64[0][0] = 0.0;
     m1->data.F64[1][0] = 1.0;
     m1->data.F64[2][0] = 2.0;
-    v2->vec.d[0] = 0.0;
-    v2->vec.d[1] = 1.0;
-    v2->vec.d[2] = 2.0;
+    v2->data.F64[0] = 0.0;
+    v2->data.F64[1] = 1.0;
+    v2->data.F64[2] = 2.0;
     v2->n = 3;
     PRINT_MATRIX(m1);