X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fbox-whisker.c;h=2e4545906f9d558059a0950d9ad5a551adeaf7f3;hb=7235f7f42b61c2b111174c3ee5ca72aac8815cd5;hp=288fc072ef119ccb2c49b2001a015a34834378ad;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp
diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c
index 288fc072ef..2e4545906f 100644
--- a/src/math/box-whisker.c
+++ b/src/math/box-whisker.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008 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
@@ -15,23 +15,28 @@
along with this program. If not, see . */
#include
+
#include "box-whisker.h"
-#include "order-stats.h"
-#include "tukey-hinges.h"
-#include
-#include
+
#include
#include
-#include
-#include
-#include
-#include
+
+#include "data/case.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/str.h"
+#include "math/order-stats.h"
+#include "math/tukey-hinges.h"
+
+#include "gl/xalloc.h"
static void
destroy (struct statistic *s)
{
- struct order_stats *os = (struct order_stats *) s;
- struct box_whisker *bw = (struct box_whisker *) s;
+ struct box_whisker *bw = UP_CAST (s, struct box_whisker, parent.parent);
+ struct order_stats *os = &bw->parent;
struct ll *ll;
for (ll = ll_head (&bw->outliers); ll != ll_null (&bw->outliers); )
@@ -53,7 +58,7 @@ static void
acc (struct statistic *s, const struct ccase *cx,
double c UNUSED, double cc UNUSED, double y)
{
- struct box_whisker *bw = (struct box_whisker *) s;
+ struct box_whisker *bw = UP_CAST (s, struct box_whisker, parent.parent);
bool extreme;
struct outlier *o;
@@ -110,13 +115,13 @@ box_whisker_outliers (const struct box_whisker *bw)
return &bw->outliers;
}
-struct statistic *
+struct box_whisker *
box_whisker_create (const struct tukey_hinges *th,
const struct variable *id_var, size_t casenumber_idx)
{
struct box_whisker *w = xzalloc (sizeof (*w));
- struct order_stats *os = (struct order_stats *) w;
- struct statistic *stat = (struct statistic *) w;
+ struct order_stats *os = &w->parent;
+ struct statistic *stat = &os->parent;
os->n_k = 0;
@@ -135,5 +140,5 @@ box_whisker_create (const struct tukey_hinges *th,
ll_init (&w->outliers);
- return stat;
+ return w;
}