Changeset 11656

Timestamp:

Feb 5, 2007, 2:50:03 PM (19 years ago)

Author:

gusciora

Message:

Modified the plan_test() args for Stats.
Modified the actual test code for the poly fit routines.

Location:

trunk/psLib/test/math

Files:

• tap_psPolyFit1D.c (modified) (3 diffs)
• tap_psPolyFit2D.c (modified) (1 diff)
• tap_psPolyFit3D.c (modified) (1 diff)
• tap_psPolyFit4D.c (modified) (1 diff)
• tap_psStats00.c (modified) (2 diffs)
• tap_psStatsTiming.c (modified) (1 diff)

trunk/psLib/test/math/tap_psPolyFit1D.c

@@ -75 +75 @@
     stats->clipSigma = CLIP_SIGMA;
     stats->clipIter = NUM_ITERATIONS;
+    stats->options |= PS_STAT_SAMPLE_STDEV;
 
     if (VERBOSE)
@@ -441 +442 @@
     ok(genericTest(TS00_MASK_U8 | TS00_FERR_F64 | TS00_X_F32 | TS00_F_F64 | TS00_POLY_CHEB, POLY_ORDER, NUM_DATA, true), "F64 tests: Chebyshev polys, non-clip fit.  Mismatch vector types");
 
-
     //
     // F32 tests: Ordinary polys, clip fit
@@ -463 +463 @@
     //
     // All Vectors non-NULL
-    ok(genericTest(TS00_MASK_U8 | TS00_FERR_F64 | TS00_X_F64 | TS00_F_F64 | TS00_POLY_ORD | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, true), "F64 tests: Ordinary polys, clip fit");
+    ok(genericTest(TS00_MASK_U8 | TS00_FERR_F64 | TS00_X_F64 | TS00_F_F64 | TS00_POLY_ORD
+                   | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, true),
+       "F64 tests: Ordinary polys, clip fit");
     // Some Vectors NULL
     //    ok(genericTest(TS00_MASK_U8 | TS00_FERR_NULL | TS00_X_F64 | TS00_F_F64 | TS00_POLY_ORD | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, true), "F64 tests: Ordinary polys, clip fit.  Some Vectors NULL");
     //    ok(genericTest(TS00_MASK_U8 | TS00_FERR_F64 | TS00_X_NULL | TS00_F_F64 | TS00_POLY_ORD | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, true), "F64 tests: Ordinary polys, clip fit.  Some Vectors NULL");
     // F-vector NULL
-    ok(genericTest(TS00_MASK_U8 | TS00_FERR_F64 | TS00_X_F64 | TS00_F_NULL | TS00_POLY_ORD | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, false), "F64 tests: Ordinary polys, clip fit.  F Vector NULL");
+    ok(genericTest(TS00_MASK_U8 | TS00_FERR_F64 | TS00_X_F64 | TS00_F_NULL | TS00_POLY_ORD
+                   | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, false),
+       "F64 tests: Ordinary polys, clip fit.  F Vector NULL");
     ok(genericTest(TS00_MASK_NULL | TS00_FERR_F64 | TS00_X_F64 | TS00_F_F32 | TS00_POLY_ORD | TS00_CLIP_FIT, POLY_ORDER, NUM_DATA, false), "F64 tests: Ordinary polys, clip fit.  F Vector NULL");
     // Mismatch vector types

trunk/psLib/test/math/tap_psPolyFit2D.c

@@ -78 +78 @@
     stats->clipSigma = CLIP_SIGMA;
     stats->clipIter = NUM_ITERATIONS;
+    stats->options |= PS_STAT_SAMPLE_STDEV;
 
     if (VERBOSE)

trunk/psLib/test/math/tap_psPolyFit3D.c

@@ -95 +95 @@
     stats->clipSigma = CLIP_SIGMA;
     stats->clipIter = NUM_ITERATIONS;
+    stats->options |= PS_STAT_SAMPLE_STDEV;
 
     if (VERBOSE)

trunk/psLib/test/math/tap_psPolyFit4D.c

@@ -117 +117 @@
     stats->clipSigma = CLIP_SIGMA;
     stats->clipIter = NUM_ITERATIONS;
+    stats->options |= PS_STAT_SAMPLE_STDEV;
 
     if (VERBOSE)

trunk/psLib/test/math/tap_psStats00.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-29 04:38:42 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 00:50:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -64 +64 @@
     psMemId idGlobal = psMemGetId();
     psLogSetFormat("HLNM");
-    plan_tests(46);
+    plan_tests(60);
 
     // Allocate data vectors for F32 tests

trunk/psLib/test/math/tap_psStatsTiming.c

@@ -15 +15 @@
 int main (void)
 {
-    plan_tests(26);
+    plan_tests(68);
 
     diag("psStats timing tests");