/* PSPP - a program for statistical analysis.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2011 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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "np.h"
+
+#include "math/np.h"
#include <gsl/gsl_cdf.h>
#include <math.h>
#include <stdlib.h>
-#include <data/case.h>
-#include <data/casewriter.h>
-#include <libpspp/compiler.h>
-#include <libpspp/cast.h>
-#include <libpspp/misc.h>
-#include <math/moments.h>
+#include "data/case.h"
+#include "data/casewriter.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "libpspp/misc.h"
+#include "math/moments.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
static void
destroy (struct statistic *stat)
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;
}
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;
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;