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 99584a5105b75879517e4b30982e9d78280a5dd1..598c05e84b22ce1536d0e98051031518158779e4 100644
(file)
--- a/
src/math/np.c
+++ b/
src/math/np.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-15,21
+15,27
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "np.h"
-#include <math/moments.h>
-#include <gl/xalloc.h>
-#include <stdlib.h>
-#include <math.h>
+
+#include "math/np.h"
+
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_cdf.h>
-#include <libpspp/compiler.h>
-#include <data/case.h>
-#include <data/casewriter.h>
+#include <math.h>
+#include <stdlib.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 "gl/xalloc.h"
static void
destroy (struct statistic *stat)
{
static void
destroy (struct statistic *stat)
{
- struct
order_stats *os = (struct order_stats *) stat
;
- free (
os
);
+ struct
np *np = UP_CAST (stat, struct np, parent.parent)
;
+ free (
np
);
}
}
@@
-38,7
+44,7
@@
acc (struct statistic *s, const struct ccase *cx UNUSED,
double c, double cc, double y)
{
struct ccase *cp;
double c, double cc, double y)
{
struct ccase *cp;
- struct np *np =
(struct np *) s
;
+ 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 rank = np->prev_cc + (c + 1) / 2.0;
double ns = gsl_cdf_ugaussian_Pinv (rank / ( np->n + 1 ));
@@
-56,7
+62,7
@@
acc (struct statistic *s, const struct ccase *cx UNUSED,
maximize (&np->y_max, y);
minimize (&np->y_min, y);
maximize (&np->y_max, y);
minimize (&np->y_min, y);
- cp = case_create (
n_NP_IDX
);
+ cp = case_create (
casewriter_get_proto (np->writer)
);
case_data_rw_idx (cp, NP_IDX_Y)->f = y;
case_data_rw_idx (cp, NP_IDX_NS)->f = ns;
case_data_rw_idx (cp, NP_IDX_DNS)->f = dns;
case_data_rw_idx (cp, NP_IDX_Y)->f = y;
case_data_rw_idx (cp, NP_IDX_NS)->f = ns;
case_data_rw_idx (cp, NP_IDX_DNS)->f = dns;
@@
-65,28
+71,34
@@
acc (struct statistic *s, const struct ccase *cx UNUSED,
np->prev_cc = cc;
}
np->prev_cc = cc;
}
-struct
order_stats
*
-np_create (
const struct moments1 *m
)
+struct
np
*
+np_create (
double n, double mean, double var
)
{
{
- double variance;
struct np *np = xzalloc (sizeof (*np));
struct np *np = xzalloc (sizeof (*np));
- struct statistic *stat = (struct statistic *) np;
- struct order_stats *os = (struct order_stats *) np;
+ struct order_stats *os = &np->parent;
+ struct statistic *stat = &os->parent;
+ struct caseproto *proto;
+ int i;
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;
- np->writer = autopaging_writer_create (n_NP_IDX);
+ proto = caseproto_create ();
+ for (i = 0; i < n_NP_IDX; i++)
+ proto = caseproto_add_width (proto, 0);
+ np->writer = autopaging_writer_create (proto);
+ caseproto_unref (proto);
os->k = 0;
stat->destroy = destroy;
stat->accumulate = acc;
os->k = 0;
stat->destroy = destroy;
stat->accumulate = acc;
- return
os
;
+ return
np
;
}
}