Changeset 5155 for trunk/psLib/test/math

Timestamp:

Sep 27, 2005, 1:19:47 PM (21 years ago)

Author:

gusciora

Message:

Incorporates new prototypes for the spline functions.

Location:

trunk/psLib/test/math

Files:

• Makefile.am (modified) (2 diffs)
• tst_psFunc02.c (deleted)
• tst_psFunc03.c (deleted)
• tst_psFunc04.c (deleted)
• tst_psFunc05.c (deleted)
• tst_psFunc07.c (deleted)
• tst_psSpline1D.c (added)
• tst_psStats07.c (modified) (2 diffs)
• verified/tst_psSpline1D.stderr (added)
• verified/tst_psSpline1D.stdout (added)

trunk/psLib/test/math/Makefile.am

@@ -7 +7 @@
     tst_psFunc00 \
     tst_psFunc01 \
-    tst_psFunc02 \
-    tst_psFunc03 \
-    tst_psFunc04 \
-    tst_psFunc05 \
-    tst_psFunc07 \
     tst_psFunc08 \
     tst_psFunc09 \
@@ -48 +43 @@
     tst_psStats08 \
     tst_psStats09 \
+    tst_psSpline1D \
     tst_psRandom
 
 tst_psFunc00_SOURCES =  tst_psFunc00.c
 tst_psFunc01_SOURCES =  tst_psFunc01.c
-tst_psFunc02_SOURCES =  tst_psFunc02.c
-tst_psFunc03_SOURCES =  tst_psFunc03.c
-tst_psFunc04_SOURCES =  tst_psFunc04.c
-tst_psFunc05_SOURCES =  tst_psFunc05.c
-tst_psFunc07_SOURCES =  tst_psFunc07.c
 tst_psFunc08_SOURCES =  tst_psFunc08.c
 tst_psFunc09_SOURCES =  tst_psFunc09.c

trunk/psLib/test/math/tst_psStats07.c

@@ -44 +44 @@
     /*  Allocate and initialize data structures                              */
     /*************************************************************************/
+    maskVector = psVectorAlloc( N, PS_TYPE_U8 );
+    maskVector->n = N;
+    myVector = p_psGaussianDev( MEAN, STDEV, N );
+    // Set the mask vector and calculate the expected maximum.
+    for ( i = 0;i < N;i++ ) {
+        if ( i < ( N / 2 ) ) {
+            maskVector->data.U8[ i ] = 0;
+            count++;
+        } else {
+            maskVector->data.U8[ i ] = 1;
+        }
+    }
+    psStats *mySampleStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN |
+                                           PS_STAT_SAMPLE_MEDIAN |
+                                           PS_STAT_SAMPLE_STDEV |
+                                           PS_STAT_SAMPLE_QUARTILE );
+    mySampleStats = psVectorStats( mySampleStats, myVector, NULL, NULL, 0 );
+    printf("The Sample Mean is %.2f\n", mySampleStats->sampleMean);
+    printf("The Sample Median is %.2f\n", mySampleStats->sampleMedian);
+    printf("The Sample stdev is %.2f\n", mySampleStats->sampleStdev);
+    printf("The Sample quartiles are (%.2f %.2f)\n", mySampleStats->sampleLQ, mySampleStats->sampleUQ);
+    psFree(mySampleStats);
+
+    psStats *mySampleStatsWithMask = psStatsAlloc( PS_STAT_SAMPLE_MEAN |
+                                     PS_STAT_SAMPLE_MEDIAN |
+                                     PS_STAT_SAMPLE_STDEV |
+                                     PS_STAT_SAMPLE_QUARTILE );
+    mySampleStatsWithMask = psVectorStats( mySampleStatsWithMask, myVector, NULL, maskVector, 1 );
+    printf("The Sample Mean is %.2f\n", mySampleStatsWithMask->sampleMean);
+    printf("The Sample Median is %.2f\n", mySampleStatsWithMask->sampleMedian);
+    printf("The Sample stdev is %.2f\n", mySampleStatsWithMask->sampleStdev);
+    printf("The Sample quartiles are (%.2f %.2f)\n", mySampleStatsWithMask->sampleLQ, mySampleStatsWithMask->sampleUQ);
+    psFree(mySampleStatsWithMask);
+
     myStats = psStatsAlloc( PS_STAT_ROBUST_MEAN |
                             PS_STAT_ROBUST_MEDIAN |
@@ -49 +83 @@
                             PS_STAT_ROBUST_STDEV |
                             PS_STAT_ROBUST_QUARTILE );
-
-    maskVector = psVectorAlloc( N, PS_TYPE_U8 );
-    maskVector->n = N;
-    myVector = p_psGaussianDev( MEAN, STDEV, N );
     // Create a full outliers:
     myVector->data.F32[N/4] = -1000.0 * MEAN;
     myVector->data.F32[N/2] = 1000.0 * MEAN;
-    // Set the mask vector and calculate the expected maximum.
-    for ( i = 0;i < N;i++ ) {
-        if ( i < ( N / 2 ) ) {
-            maskVector->data.U8[ i ] = 0;
-            count++;
-        } else {
-            maskVector->data.U8[ i ] = 1;
-        }
-    }
     /*************************************************************************/
     /*  Call psVectorStats() with no vector mask.                            */