Changeset 12246 for trunk/psLib

Timestamp:

Mar 5, 2007, 3:22:00 PM (19 years ago)

Author:

gusciora

Message:

Removed the psVector->n++ increments.

File:

• trunk/psLib/test/math/tap_psStats07.c (modified) (14 diffs)

trunk/psLib/test/math/tap_psStats07.c

@@ -5 +5 @@
    XXX: Must add tests for various data types, other than psF32.  Copy code
    from tst_psStats00.c-tst_psStats02.c.
+
+   XXX: This basically works.  Must add bad paramater tests, and test other
+   data types, different vector sizes, etc.
 *****************************************************************************/
 #include <stdio.h>
@@ -103 +106 @@
         for (psS32 i=0;i<numData;i++) {
             in->data.F32[i] = gaussVector->data.F32[i];
-            in->n++;
+//            in->n++;
         }
 
@@ -119 +122 @@
         for (psS32 i=0;i<numData;i++) {
             in->data.F64[i] = (psF64) gaussVector->data.F32[i];
-            in->n++;
+//            in->n++;
         }
 
@@ -135 +138 @@
         for (psS32 i=0;i<numData;i++) {
             in->data.S8[i] = (psS8) gaussVector->data.F32[i];
-            in->n++;
+//            in->n++;
         }
 
@@ -151 +154 @@
         for (psS32 i=0;i<numData;i++) {
             in->data.U16[i] = (psU16) gaussVector->data.F32[i];
-            in->n++;
+//            in->n++;
         }
 
@@ -167 +170 @@
         for (psS32 i=0;i<numData;i++) {
             in->data.S32[i] = (psS32) gaussVector->data.F32[i];
-            in->n++;
+//            in->n++;
         }
 
@@ -190 +193 @@
         for (psS32 i=0;i<numData;i++) {
             errors->data.F32[i] = ERRORS;
-            errors->n++;
+//            errors->n++;
         }
 
@@ -206 +209 @@
         for (psS32 i=0;i<numData;i++) {
             errors->data.F64[i] = ERRORS;
-            errors->n++;
+//            errors->n++;
         }
 
@@ -222 +225 @@
         for (psS32 i=0;i<numData;i++) {
             errors->data.S8[i] = (psS8) ERRORS;
-            errors->n++;
+//            errors->n++;
         }
 
@@ -238 +241 @@
         for (psS32 i=0;i<numData;i++) {
             errors->data.U16[i] = (psU16) ERRORS;
-            errors->n++;
+//            errors->n++;
         }
 
@@ -254 +257 @@
         for (psS32 i=0;i<numData;i++) {
             errors->data.S32[i] = (psS32) ERRORS;
-            errors->n++;
+//            errors->n++;
         }
 
@@ -276 +279 @@
         for (psS32 i=0;i<numData;i++) {
             mask->data.U8[i] = (psU8) 0;
-            mask->n++;
+//            mask->n++;
         }
 
@@ -292 +295 @@
         for (psS32 i=0;i<numData;i++) {
             mask->data.S32[i] = (psS32) 0;
-            mask->n++;
+//            mask->n++;
         }
 
@@ -500 +503 @@
     plan_tests(3);
 
-//    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_NULL, NUM_DATA, 1, true), "RobustStatsTest() F32 data");
-    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_U8, NUM_DATA, 1, true), "RobustStatsTest() F32 data, non-NULL errors and mask vector");
-//    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_F32 | TST_MASK_U8, NUM_DATA, 1, true), "RobustStatsTest() F32 data, non-NULL errors and mask vector");
+    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_NULL,
+       NUM_DATA, 1, true), "RobustStatsTest() F32 data, NULL errors, NULL mask");
+    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_U8, 
+       NUM_DATA, 1, true), "RobustStatsTest() F32 data, non-NULL errors and mask vector");
+    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_F32 | TST_MASK_U8,
+        NUM_DATA, 1, true), "RobustStatsTest() F32 data, non-NULL errors and mask vector");
 
     ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");