Changeset 6215 for trunk/psLib/test/math/tst_psStats07.c

Timestamp:

Jan 26, 2006, 1:49:11 PM (20 years ago)

Author:

gusciora

Message:

Made the requested changes to the psStats structure and added the fitted
statistics.

File:

• trunk/psLib/test/math/tst_psStats07.c (modified) (10 diffs)

trunk/psLib/test/math/tst_psStats07.c

@@ -40 +40 @@
     float realUQNoMask = MEAN + ( 0.6 * STDEV );
     psS32 realN50NoMask = N / 4;
-    psS32 realNfitNoMask = N / 4;
 
     /*************************************************************************/
@@ -79 +78 @@
     psFree(mySampleStatsWithMask);
 
-    myStats = psStatsAlloc( PS_STAT_ROBUST_MEAN |
-                            PS_STAT_ROBUST_MEDIAN |
-                            PS_STAT_ROBUST_MODE |
-                            PS_STAT_ROBUST_STDEV |
-                            PS_STAT_ROBUST_QUARTILE );
+    myStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN |
+                           PS_STAT_ROBUST_STDEV |
+                           PS_STAT_ROBUST_QUARTILE |
+                           PS_STAT_FITTED_MEAN |
+                           PS_STAT_FITTED_STDEV);
     // Create a full outliers:
     myVector->data.F32[N/4] = -1000.0 * MEAN;
@@ -101 +100 @@
 
     printf( "The expected Mean was %.2f; the calculated Mean was %.2f\n",
-            realMeanNoMask, myStats->robustMean );
-
-    if ( fabs( myStats->robustMean - realMeanNoMask ) < ( ERROR_TOLERANCE * realMeanNoMask ) ) {
+            realMeanNoMask, myStats->fittedMean );
+
+    if ( fabs( myStats->fittedMean - realMeanNoMask ) < ( ERROR_TOLERANCE * realMeanNoMask ) ) {
         testStatus = true;
     } else {
@@ -157 +156 @@
 
     printf( "The expected Stdev was %.2f; the calculated Stdev was %.2f\n",
-            realStdevNoMask, myStats->robustStdev );
-    if ( fabs( myStats->robustStdev - realStdevNoMask ) < ( ERROR_TOLERANCE * realStdevNoMask ) ) {
+            realStdevNoMask, myStats->fittedStdev );
+    if ( fabs( myStats->fittedStdev - realStdevNoMask ) < ( ERROR_TOLERANCE * realStdevNoMask ) ) {
         testStatus = true;
     } else {
@@ -208 +207 @@
                              "psStats functions",
                              "PS_STAT_ROBUST_STATS: robust N50: no vector mask" );
-
     // XXX:
     realN50NoMask = myStats->robustN50;
@@ -227 +225 @@
                  testStatus );
 
-    printPositiveTestHeader( stdout,
-                             "psStats functions",
-                             "PS_STAT_ROBUST_STATS: robust Nfit: no vector mask" );
-
-    // XXX:
-    realNfitNoMask = myStats->robustNfit;
-
-    printf( "The expected Nfit was %d; the calculated Nfit was %d\n",
-            realNfitNoMask, myStats->robustNfit );
-    /* XXX: fix
-        if ( fabs( myStats->robustNfit - realNfitNoMask ) < ( ERROR_TOLERANCE * realNfitNoMask ) ) {
-            testStatus = true;
-        } else {
-            testStatus = false;
-            globalTestStatus = false;
-        }
-    */
-    printFooter( stdout,
-                 "psVector functions",
-                 "PS_STAT_ROBUST_STATS: robust Nfit: no vector mask",
-                 testStatus );
 
     /*************************************************************************/
@@ -296 +273 @@
     float realUQWithMask = MEAN;
     psS32 realN50WithMask = N / 4;
-    psS32 realNfitWithMask = N / 4;
     /*************************************************************************/
     /*  Allocate and initialize data structures                              */
     /*************************************************************************/
-    myStats = psStatsAlloc( PS_STAT_ROBUST_MEAN |
-                            PS_STAT_ROBUST_MEDIAN |
-                            PS_STAT_ROBUST_MODE |
-                            PS_STAT_ROBUST_STDEV |
-                            PS_STAT_ROBUST_QUARTILE );
+    myStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN |
+                           PS_STAT_ROBUST_STDEV |
+                           PS_STAT_ROBUST_QUARTILE |
+                           PS_STAT_FITTED_MEAN |
+                           PS_STAT_FITTED_STDEV);
 
     maskVector = psVectorAlloc( N, PS_TYPE_U8 );
@@ -334 +310 @@
     printf( "Called psVectorStats() on a vector with elements masked.\n" );
     printf( "The expected Mean was %.2f; the calculated Mean was %.2f\n",
-            realMeanWithMask, myStats->robustMean );
-    if ( fabs( myStats->robustMean - realMeanWithMask ) < ( ERROR_TOLERANCE * realMeanWithMask ) ) {
+            realMeanWithMask, myStats->fittedMean );
+    if ( fabs( myStats->fittedMean - realMeanWithMask ) < ( ERROR_TOLERANCE * realMeanWithMask ) ) {
         testStatus = true;
     } else {
@@ -389 +365 @@
 
     printf( "The expected Stdev was %.2f; the calculated Stdev was %.2f\n",
-            realStdevWithMask, myStats->robustStdev );
-    if ( fabs( myStats->robustStdev - realStdevWithMask ) < ( ERROR_TOLERANCE * realStdevWithMask ) ) {
+            realStdevWithMask, myStats->fittedStdev );
+    if ( fabs( myStats->fittedStdev - realStdevWithMask ) < ( ERROR_TOLERANCE * realStdevWithMask ) ) {
         testStatus = true;
     } else {
@@ -459 +435 @@
                  "PS_STAT_ROBUST_STATS: robust N50: with vector mask",
                  testStatus );
-
-
-
-    printPositiveTestHeader( stdout,
-                             "psStats functions",
-                             "PS_STAT_ROBUST_STATS: robust Nfit: with vector mask" );
-
-    printf( "The expected Nfit was %d; the calculated Nfit was %d\n",
-            realNfitWithMask, myStats->robustNfit );
-    /* XXX: fix
-        if ( fabs( myStats->robustNfit - realNfitWithMask ) < ( ERROR_TOLERANCE * realNfitWithMask ) ) {
-            testStatus = true;
-        } else {
-            testStatus = false;
-            globalTestStatus = false;
-        }
-    */
-    printFooter( stdout,
-                 "psVector functions",
-                 "PS_STAT_ROBUST_STATS: robust Nfit: with vector mask",
-                 testStatus );
-