Changeset 8232 for trunk/psLib/src/math/psStats.c

Timestamp:

Aug 8, 2006, 1:32:23 PM (20 years ago)

Author:

jhoblitt

Message:

bug #790 - remove psErrorText.h and inline all error codes. all newly inlined error codes are wrapped with the _() macro from future gettextification

Location:

trunk/psLib/src

Files:

• . (modified) (1 prop)
• math/psStats.c (modified) (7 diffs)

trunk/psLib/src

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.182 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 00:44:05 $
+ *  @version $Revision: 1.183 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 #include "psString.h"
 
-#include "psErrorText.h"
+
 
 /*****************************************************************************/
@@ -440 +440 @@
         psError(PS_ERR_UNEXPECTED_NULL,
                 false,
-                PS_ERRORTEXT_psStats_STATS_SAMPLE_MEDIAN_SORT_PROBLEM);
+                _("Failed to sort input data."));
         psTrace(__func__, 4, "---- %s(false) end ----\n", __func__);
         psFree(vector);
@@ -924 +924 @@
                 ((y->data.F64[2] <= yVal) && (yVal <= y->data.F64[0]))) ) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psStats_YVAL_OUT_OF_RANGE,
+                    _("Specified yVal, %g, is not within y-range, %g to %g."),
                     (psF64)yVal, y->data.F64[0], y->data.F64[2]);
         }
@@ -946 +946 @@
         if (myPoly == NULL) {
             psError(PS_ERR_UNEXPECTED_NULL, false,
-                    PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT);
+                    _("Failed to fit a 1-dimensional polynomial to the three specified data points.  Returning NAN."));
             psFree(x);
             psFree(y);
@@ -967 +967 @@
         if (isnan(tmpFloat)) {
             psError(PS_ERR_UNEXPECTED_NULL,
-                    false, PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLY_MEDIAN);
+                    false, _("Failed to determine the median of the fitted polynomial.  Returning NAN."));
             psFree(x);
             psFree(y);
@@ -2035 +2035 @@
                           PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV)) {
         if (!vectorRobustStats(inF32, errorsF32, maskU8, maskVal, stats)) {
-            psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psStats_STATS_FAILED);
+            psError(PS_ERR_UNKNOWN, false, _("Failed to calculate the specified statistic."));
             psFree(stats);
             psFree(inF32);

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg