X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fexpressions%2Fhelpers.c;h=c69e440e4bde0f9c8747296884c0cf83e9ce2b45;hb=5d612c43713291cae1aa473ee3d31786ef6f5b99;hp=17fc3182253369ef9177a29f186b04355cc15639;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp
diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c
index 17fc318225..c69e440e4b 100644
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2010, 2011, 2015, 2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,29 +15,19 @@
along with this program. If not, see . */
#include
-#include "helpers.h"
+
+#include "language/expressions/helpers.h"
+
#include
#include
-#include
-#include
-#include "private.h"
-
-const struct substring empty_string = {NULL, 0};
-static void
-expr_error (void *aux UNUSED, const char *format, ...)
-{
- struct msg m;
- va_list args;
+#include "language/expressions/private.h"
+#include "libpspp/assertion.h"
+#include "libpspp/pool.h"
- m.category = MSG_C_SYNTAX;
- m.severity = MSG_S_ERROR;
- va_start (args, format);
- m.text = xvasprintf (format, args);
- va_end (args);
+#include "gl/minmax.h"
- msg_emit (&m);
-}
+const struct substring empty_string = {NULL, 0};
double
expr_ymd_to_ofs (double year, double month, double day)
@@ -45,6 +35,8 @@ expr_ymd_to_ofs (double year, double month, double day)
int y = year;
int m = month;
int d = day;
+ char *error;
+ double ofs;
if (y != year || m != month || d != day)
{
@@ -53,7 +45,13 @@ expr_ymd_to_ofs (double year, double month, double day)
return SYSMIS;
}
- return calendar_gregorian_to_offset (y, m, d, expr_error, NULL);
+ ofs = calendar_gregorian_to_offset (y, m, d, &error);
+ if (error != NULL)
+ {
+ msg (SE, "%s", error);
+ free (error);
+ }
+ return ofs;
}
double
@@ -179,12 +177,13 @@ recognize_unit (struct substring name, enum date_unit *unit)
return true;
}
- /* TRANSLATORS: Don't translate the the actual unit names `weeks', `days' etc
- They must remain in their original English. */
msg (SE, _("Unrecognized date unit `%.*s'. "
- "Valid date units are `years', `quarters', `months', "
- "`weeks', `days', `hours', `minutes', and `seconds'."),
- (int) ss_length (name), ss_data (name));
+ "Valid date units are `%s', `%s', `%s', "
+ "`%s', `%s', `%s', `%s', and `%s'."),
+ (int) ss_length (name), ss_data (name),
+ "years", "quarters", "months",
+ "weeks", "days", "hours", "minutes", "seconds");
+
return false;
}
@@ -332,7 +331,7 @@ recognize_method (struct substring method_name, enum date_sum_method *method)
else
{
msg (SE, _("Invalid DATESUM method. "
- "Valid choices are `closest' and `rollover'."));
+ "Valid choices are `%s' and `%s'."), "closest", "rollover");
return false;
}
}
@@ -344,6 +343,7 @@ add_months (double date, int months, enum date_sum_method method)
{
int y, m, d, yd;
double output;
+ char *error;
calendar_offset_to_gregorian (date / DAY_S, &y, &m, &d, &yd);
y += months / 12;
@@ -363,9 +363,14 @@ add_months (double date, int months, enum date_sum_method method)
if (method == SUM_CLOSEST && d > calendar_days_in_month (y, m))
d = calendar_days_in_month (y, m);
- output = calendar_gregorian_to_offset (y, m, d, expr_error, NULL);
+ output = calendar_gregorian_to_offset (y, m, d, &error);
if (output != SYSMIS)
output = (output * DAY_S) + fmod (date, DAY_S);
+ else
+ {
+ msg (SE, "%s", error);
+ free (error);
+ }
return output;
}
@@ -658,3 +663,96 @@ npdf_beta (double x, double a, double b, double lambda)
return sum;
}
}
+
+static double
+round__ (double x, double mult, double fuzzbits, double adjustment)
+{
+ if (fuzzbits <= 0)
+ fuzzbits = settings_get_fuzzbits ();
+ adjustment += exp2 (fuzzbits - DBL_MANT_DIG);
+
+ x /= mult;
+ x = x >= 0. ? floor (x + adjustment) : -floor (-x + adjustment);
+ return x * mult;
+}
+
+double
+round_nearest (double x, double mult, double fuzzbits)
+{
+ return round__ (x, mult, fuzzbits, .5);
+}
+
+double
+round_zero (double x, double mult, double fuzzbits)
+{
+ return round__ (x, mult, fuzzbits, 0);
+}
+
+struct substring
+replace_string (struct expression *e,
+ struct substring haystack,
+ struct substring needle,
+ struct substring replacement,
+ double n)
+{
+ if (!needle.length
+ || haystack.length < needle.length
+ || n <= 0
+ || n == SYSMIS)
+ return haystack;
+
+ struct substring result = alloc_string (e, MAX_STRING);
+ result.length = 0;
+
+ size_t i = 0;
+ while (i <= haystack.length - needle.length)
+ if (!memcmp (&haystack.string[i], needle.string, needle.length))
+ {
+ size_t copy_len = MIN (replacement.length, MAX_STRING - result.length);
+ memcpy (&result.string[result.length], replacement.string, copy_len);
+ result.length += copy_len;
+ i += needle.length;
+
+ if (--n < 1)
+ break;
+ }
+ else
+ {
+ if (result.length < MAX_STRING)
+ result.string[result.length++] = haystack.string[i];
+ i++;
+ }
+ while (i < haystack.length && result.length < MAX_STRING)
+ result.string[result.length++] = haystack.string[i++];
+
+ return result;
+}
+
+static int
+compare_doubles (const void *a_, const void *b_)
+{
+ const double *ap = a_;
+ const double *bp = b_;
+ double a = *ap;
+ double b = *bp;
+
+ /* Sort SYSMIS to the end. */
+ return (a == b ? 0
+ : a == SYSMIS ? 1
+ : b == SYSMIS ? -1
+ : a > b ? 1 : -1);
+}
+
+double
+median (double *a, size_t n)
+{
+ /* Sort the array in-place, sorting SYSMIS to the end. */
+ qsort (a, n, sizeof *a, compare_doubles);
+
+ /* Drop SYSMIS. */
+ n = count_valid (a, n);
+
+ return (!n ? SYSMIS
+ : n % 2 ? a[n / 2]
+ : (a[n / 2 - 1] + a[n / 2]) / 2.0);
+}