Changeset 12691

Timestamp:

Mar 29, 2007, 4:53:26 PM (19 years ago)

Author:

Paul Price

Message:

Replacing log messages with warnings.

File:

• trunk/psLib/src/math/psStats.c (modified) (9 diffs)

trunk/psLib/src/math/psStats.c

@@ -13 +13 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.205 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-28 00:49:13 $
+ *  @version $Revision: 1.206 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-30 02:53:26 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -223 +223 @@
 vectorMinMax(myVector, maskVector, maskVal, stats): calculates the minimum and maximum of the input vector.
 If there was a problem with the calculation, this routine sets stats->max and stats->min to NAN.  Return the
-number of valid values in the vector (those not masked or outside the specified range.
+number of valid values in the vector (those not masked or outside the specified range).
 XXX : using the method below, with a single loop for various options
       costs only a small amount and is much easier to debug. running 10000 tests
@@ -393 +393 @@
     if (isnan(stats->sampleMean)) {
         stats->sampleStdev = NAN;
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): vectorSampleMean() reported a NAN mean.\n");
+        psWarning("WARNING: vectorSampleStdev(): vectorSampleMean() reported a NAN mean.\n");
         psTrace("psLib.math", 4, "---- %s() end ----\n", __func__);
         return false;
@@ -429 +429 @@
     if (count == 0) {
         stats->sampleStdev = NAN;
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): no valid psVector elements (%ld).  Setting stats->sampleStdev = NAN.\n", count);
+        psWarning("WARNING: vectorSampleStdev(): no valid psVector elements (%ld).  Setting stats->sampleStdev = NAN.\n", count);
         return false;
     }
     if (count == 1) {
         stats->sampleStdev = 0.0;
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): only one valid psVector elements (%ld).  Setting stats->sampleStdev = 0.0.\n", count);
+        psWarning("WARNING: vectorSampleStdev(): only one valid psVector elements (%ld).  Setting stats->sampleStdev = 0.0.\n", count);
         return false;
     }
@@ -502 +502 @@
     vectorSampleMedian(myVector, tmpMask, maskVal, stats);
     if (isnan(stats->sampleMedian)) {
-        psLogMsg(__func__, PS_LOG_WARN, "Call to vectorSampleMedian returned NAN\n");
+        psWarning("Call to vectorSampleMedian returned NAN\n");
         psTrace("psLib.math", 4, "---- %s(false) end ----\n", __func__);
         psFree(tmpMask);
@@ -512 +512 @@
     vectorSampleStdev(myVector, errors, tmpMask, maskVal, stats);
     if (isnan(stats->sampleStdev)) {
-        psLogMsg(__func__, PS_LOG_WARN, "Call to vectorSampleStdev returned NAN\n");
+        psWarning("Call to vectorSampleStdev returned NAN\n");
         psTrace("psLib.math", 4, "---- %s(false) end ----\n", __func__);
         psFree(tmpMask);
@@ -1362 +1362 @@
         PS_BIN_FOR_VALUE (binMin, histogram->bounds, guessMean - minFitSigma*guessStdev, 0);
         PS_BIN_FOR_VALUE (binMax, histogram->bounds, guessMean + maxFitSigma*guessStdev, 0);
-        if (binMin == binMax) {
-            psAbort ("invalid range for fitted mean");   
-        }
+        if (binMin == binMax) {
+            psAbort ("invalid range for fitted mean");
+        }
 
         // search for mode (peak of histogram within range mean-2sigma - mean+2sigma
@@ -1557 +1557 @@
         // However, it is also not used anywhere, yet.
         //
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSmoothHistGaussian() on non-uniform histograms has not been tested or used.\n");
+        psWarning("WARNING: vectorSmoothHistGaussian() on non-uniform histograms has not been tested or used.\n");
 
         for (long i = 0; i < numBins; i++) {
@@ -1923 +1923 @@
         psStatsOptions option = psStatsOptionFromString(statString);
         if (option == 0) {
-            psLogMsg(__func__, PS_LOG_WARN, "Unable to interpret statistic option: %s --- ignored.\n",
+            psWarning("Unable to interpret statistic option: %s --- ignored.\n",
                      statString);
             continue;