projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
math
/
np.c
diff --git
a/src/math/np.c
b/src/math/np.c
index ccaa51e22d24a0e96a91996f7f597df547d3c6ce..598c05e84b22ce1536d0e98051031518158779e4 100644
(file)
--- a/
src/math/np.c
+++ b/
src/math/np.c
@@
-72,9
+72,8
@@
acc (struct statistic *s, const struct ccase *cx UNUSED,
}
struct np *
}
struct np *
-np_create (
const struct moments1 *m
)
+np_create (
double n, double mean, double var
)
{
{
- double variance;
struct np *np = xzalloc (sizeof (*np));
struct order_stats *os = &np->parent;
struct statistic *stat = &os->parent;
struct np *np = xzalloc (sizeof (*np));
struct order_stats *os = &np->parent;
struct statistic *stat = &os->parent;
@@
-83,9
+82,10
@@
np_create (const struct moments1 *m)
np->prev_cc = 0;
np->prev_cc = 0;
- moments1_calculate (m, &np->n, &np->mean, &variance, NULL, NULL);
+ np->n = n;
+ np->mean = mean;
- np->stddev = sqrt (var
iance
);
+ np->stddev = sqrt (var);
np->y_min = np->ns_min = np->dns_min = DBL_MAX;
np->y_max = np->ns_max = np->dns_max = -DBL_MAX;
np->y_min = np->ns_min = np->dns_min = DBL_MAX;
np->y_max = np->ns_max = np->dns_max = -DBL_MAX;