projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start writing documentation.
[pspp]
/
src
/
language
/
expressions
/
helpers.c
diff --git
a/src/language/expressions/helpers.c
b/src/language/expressions/helpers.c
index 57e17713b994f9036c97ddda0d829035fb726605..4a0a01b97b680907b0c1efe33f9bb1010e68891a 100644
(file)
--- a/
src/language/expressions/helpers.c
+++ b/
src/language/expressions/helpers.c
@@
-45,7
+45,8
@@
expr_ymd_to_ofs (double year, double month, double day)
return SYSMIS;
}
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 (error != NULL)
{
msg (SE, "%s", error);
@@
-363,7
+364,8
@@
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);
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
if (output != SYSMIS)
output = (output * DAY_S) + fmod (date, DAY_S);
else
@@
-664,20
+666,30
@@
npdf_beta (double x, double a, double b, double lambda)
}
}
}
}
-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 ();
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;
}
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
replace_string (struct expression *e,
struct substring haystack,