return SYSMIS;
}
- ofs = calendar_gregorian_to_offset (y, m, d, &error);
+ ofs = calendar_gregorian_to_offset (y, m, d, settings_get_fmt_settings (),
+ &error);
if (error != NULL)
{
msg (SE, "%s", error);
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, &error);
+ output = calendar_gregorian_to_offset (y, m, d, settings_get_fmt_settings (),
+ &error);
if (output != SYSMIS)
output = (output * DAY_S) + fmod (date, DAY_S);
else
}
}
-double
-round_nearest (double x, double mult, double fuzzbits)
+static double
+round__ (double x, double mult, double fuzzbits, double adjustment)
{
- double adjustment;
-
if (fuzzbits <= 0)
fuzzbits = settings_get_fuzzbits ();
- adjustment = .5 + exp2 (fuzzbits - DBL_MANT_DIG);
+ 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,