Make data input and output take a fmt_settings structure.

[pspp] / src / math / np.c

diff --git a/src/math/np.c b/src/math/np.c
index ccaa51e22d24a0e96a91996f7f597df547d3c6ce..dd197f9c6d392c9eb13886f21471bcd3cd0b2ac3 100644 (file)
--- a/src/math/np.c
+++ b/src/math/np.c
@@ -47,7 +47,7 @@ acc (struct statistic *s, const struct ccase *cx UNUSED,
   struct np *np = UP_CAST (s, struct np, parent.parent);
   double rank = np->prev_cc + (c + 1) / 2.0;
 
-  double ns = gsl_cdf_ugaussian_Pinv (rank / ( np->n + 1 ));
+  double ns = gsl_cdf_ugaussian_Pinv (rank / (np->n + 1));
 
   double z = (y - np->mean) / np->stddev;
 
@@ -72,9 +72,8 @@ acc (struct statistic *s, const struct ccase *cx UNUSED,
 }
 
 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;
@@ -83,9 +82,10 @@ np_create (const struct moments1 *m)
 
   np->prev_cc = 0;
 
-  moments1_calculate (m, &np->n, &np->mean, &variance, NULL, NULL);
+  np->n = n;
+  np->mean = mean;
 
-  np->stddev = sqrt (variance);
+  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;