Changeset 6283 for trunk/psLib/test/imageops/tst_psImageStats.c

Timestamp:

Feb 1, 2006, 11:44:36 AM (20 years ago)

Author:

gusciora

Message:

....

File:

• trunk/psLib/test/imageops/tst_psImageStats.c (modified) (7 diffs)

trunk/psLib/test/imageops/tst_psImageStats.c

@@ -29 +29 @@
 
 testDescription tests[] = {
-                              {testPsImageHistogram, 0, "psImageHistogram", 0, true},
+                              {testPsImageHistogram, 0, "psImageHistogram", 0, false},
                               {testPsImageStats, 1, "psImageStats", 0, false},
-                              {testPsImageFitPolynomial, 2, "psImageFitPolynomial", 0, true},
-                              {testPsImagePixelInterpolate, 3, "psImagePixelInterpolate", 0, true},
-                              {testPsImageEvalPolynom, 4, "psImageEvalPolynom()", 0, true},
-                              {testImageCountPixel, 5, "psImageCountPixel", 0, true},
+                              {testPsImageFitPolynomial, 2, "psImageFitPolynomial", 0, false},
+                              {testPsImagePixelInterpolate, 3, "psImagePixelInterpolate", 0, false},
+                              {testPsImageEvalPolynom, 4, "psImageEvalPolynom()", 0, false},
+                              {testImageCountPixel, 5, "psImageCountPixel", 0, false},
                               {NULL}
                           };
@@ -220 +220 @@
 }
 
-// HEY: XXX
 static psS32 testPsImageFitPolynomial()
 {
@@ -638 +637 @@
 }
 
-int trentBug()
-{
-    psTraceSetLevel("p_psVectorRobustStats", 6);
-    psTraceSetLevel("vectorBinDisectF32", 6);
-
-    psFits *fits = psFitsOpen("f0230_c01_606365_12k_i.fits", "r");
-    psRegion region = {0, 0, 0, 0};
-    psImage *image = psFitsReadImage(NULL, fits, region, 0);
-    psFitsClose(fits);
-    int numNaN = psImageClipNaN(image, 0.0);
-    printf("Clipped %d NaN pixels.\n", numNaN);
-
-    psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
-    stats->clipSigma = 2;
-    stats->clipIter = 5;
-    stats = psImageStats(stats, image, NULL, 0);
-
-    printf("%lf %lf\n", stats->robustMedian, stats->robustStdev);
-    psFree(image);
-    psFree(stats);
-
-    return(0);
-}
-
-
 static psS32 testPsImageStats()
 {
-    trentBug();
-    return(0);
-
     psTraceSetLevel("p_psVectorRobustStats", 0);
 
@@ -764 +735 @@
         }
 
-        //HEY
-        //        myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN );
-        myStats = psStatsAlloc( PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV | PS_STAT_ROBUST_QUARTILE | PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV );
+        myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN );
+        //        myStats = psStatsAlloc( PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV | PS_STAT_ROBUST_QUARTILE | PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV );
         /*************************************************************************/
         /*  Calculate Sample Mean with no mask                           */
@@ -776 +746 @@
             psAbort(__func__,"Failed input psStats equal to returned psStats");
         }
-        //        fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
-        fprintf(stderr, "The fitted mean was %.2f\n", myStats->fittedMean );
+        fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
 
         /*************************************************************************/
@@ -787 +756 @@
             fprintf(stderr,"TEST ERROR: psImageStats() returned NULL.\n");
         } else {
-            //        fprintf(stderr, "The fitted mean was %.2f\n", myStats->fittedMean );
-            fprintf(stderr, "The fitted mean was %.2f\n", myStats->fittedMean );
+            fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
         }
 
@@ -839 +807 @@
 }
 
-
-
-
-
-//This code will