Changeset 5656

Timestamp:

Dec 1, 2005, 2:51:48 PM (21 years ago)

Author:

mberning

Message:

Added Support for different data typesCVS: ----------------------------------------------------------------------

File:

• trunk/psLib/test/mathtypes/tst_psVector.c (modified) (5 diffs)

trunk/psLib/test/mathtypes/tst_psVector.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-09-26 22:35:54 $
+ *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-12-02 00:51:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 static psS32 testVectorInit(void);
 static psS32 testVectorCreate(void);
+static psS32 testVectorCreateA(void);
+static psS32 testVectorCreateB(void);
 static psS32 testVectorGetSet(void);
 static psS32 testVectorCountPixelMask(void);
@@ -38 +40 @@
                               {testVectorInit,-4,"psVectorInit",0,false},
                               {testVectorCreate,-5,"psVectorCreate",0,false},
-                              {testVectorGetSet,-6,"psVectorGet/Set",0,false},
-                              {testVectorCountPixelMask,-7,"psVectorCountPixelMask",0,false},
+                              {testVectorCreateA,-6,"psVectorCreateA",0,false},
+                              {testVectorCreateB,-7,"psVectorCreateB",0,false},
+                              {testVectorGetSet,-8,"psVectorGet/Set",0,false},
+                              {testVectorCountPixelMask,-9,"psVectorCountPixelMask",0,false},
                               {NULL}
                           };
@@ -371 +375 @@
     psVector *test2 = NULL;
     psVector *input = NULL;
-    psVector *input2 = psVectorAlloc(5, PS_TYPE_F64);
+    psVector *input2 = psVectorAlloc(5, PS_TYPE_F32);
 
     test = psVectorCreate(input, 0.0, 10.0, 1.0, PS_TYPE_S32);
@@ -392 +396 @@
     return 0;
 }
-
+psS32 testVectorCreateA(void)
+{
+    //
+    //  Test PS_TYPE_F64
+    //       PS_TYPE_S64
+    //
+    psVector *test = NULL;
+    psVector *test2 = NULL;
+    psVector *input = NULL;
+    psVector *input2 = psVectorAlloc(5, PS_TYPE_F64);
+
+    test = psVectorCreate(input, 0.0, 10.0, 1.0, PS_TYPE_S64);
+    test2 = psVectorCreate(input2, 0.0, 5.0, 0.5, PS_TYPE_F64);
+
+    for (int i = 0; i < 10; i++) {
+        if (test->data.S64[i] != i) {
+            fprintf(stderr, "Vector data does not match. i = %d, data=%ld\n",
+                    i, (long)test->data.S64[i]);
+            return 1;
+        }
+        if (test2->data.F64[i] != i*0.5) {
+            fprintf(stderr, "Vector data does not match. i = %d, data=%f\n",
+                    i, test->data.F64[i]);
+            return 1;
+        }
+    }
+    psFree(test);
+    psFree(test2);
+    return 0;
+}
+psS32 testVectorCreateB(void)
+{
+    //
+    //  Test PS_TYPE_U16
+    //       PS_TYPE_S16
+    //
+    psVector *test = NULL;
+    psVector *test2 = NULL;
+    psVector *input = NULL;
+    psVector *input2 = psVectorAlloc(5, PS_TYPE_U16);
+
+    test = psVectorCreate(input, 0.0, 10.0, 1.0, PS_TYPE_S16);
+    test2 = psVectorCreate(input2, 0.0, 20.0, 2.0, PS_TYPE_U16);
+
+    for (int i = 0; i < 10; i++) {
+        if (test->data.S16[i] != i) {
+            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n",
+                    i, test->data.S16[i]);
+            return 1;
+        }
+        if (test2->data.U16[i] != i*2.0) {
+            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n",
+                    i, test->data.U16[i]);
+            return 1;
+        }
+    }
+    psFree(test);
+    psFree(test2);
+    return 0;
+}
 psS32 testVectorGetSet(void)
 {