X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Fbox-whisker.c;h=53831824a09a32d0b5025607628983f7e1bba22e;hb=5d612c43713291cae1aa473ee3d31786ef6f5b99;hp=de4124efe16c5beb799c7b5d0b2af42743ff79d7;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp
diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c
index de4124efe1..53831824a0 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, 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
@@ -15,18 +15,23 @@
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
+
+#include "data/case.h"
+#include "data/data-out.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)
@@ -35,7 +40,7 @@ destroy (struct statistic *s)
struct order_stats *os = &bw->parent;
struct ll *ll;
- for (ll = ll_head (&bw->outliers); ll != ll_null (&bw->outliers); )
+ for (ll = ll_head (&bw->outliers); ll != ll_null (&bw->outliers);)
{
struct outlier *e = ll_data (ll, struct outlier, ll);
@@ -58,20 +63,28 @@ acc (struct statistic *s, const struct ccase *cx,
bool extreme;
struct outlier *o;
- if ( y < bw->hinges[2] + bw->step)
- bw->whiskers[1] = y;
+ if (y > bw->hinges[2] + bw->step) /* Upper outlier */
+ {
+ extreme = (y > bw->hinges[2] + 2 * bw->step) ;
+ }
- if (bw->whiskers[0] == SYSMIS || bw->hinges[0] - bw->step > y)
- bw->whiskers[0] = y;
+ else if (y < bw->hinges[0] - bw->step) /* Lower outlier */
+ {
+ extreme = (y < bw->hinges[0] - 2 * bw->step) ;
+ }
- if ( y > bw->hinges[2] + bw->step)
- extreme = (y > bw->hinges[2] + 2 * bw->step) ;
+ else /* Not an outlier */
+ {
+ if (bw->whiskers[0] == SYSMIS)
+ bw->whiskers[0] = y;
- else if (y < bw->hinges[0] - bw->step)
- extreme = (y < bw->hinges[0] - 2 * bw->step) ;
+ if (y > bw->whiskers[1])
+ bw->whiskers[1] = y;
- else
- return;
+ return;
+ }
+
+ /* y is an outlier */
o = xzalloc (sizeof *o) ;
o->value = y;
@@ -79,13 +92,20 @@ acc (struct statistic *s, const struct ccase *cx,
ds_init_empty (&o->label);
if (bw->id_var)
- var_append_value_name (bw->id_var,
- case_data (cx, bw->id_var),
- &o->label);
+ {
+ char *s = data_out (case_data_idx (cx, bw->id_idx),
+ var_get_encoding (bw->id_var),
+ var_get_print_format (bw->id_var));
+
+ ds_put_cstr (&o->label, s);
+ free (s);
+ }
else
- ds_put_format (&o->label,
- "%ld",
- (casenumber) case_data_idx (cx, bw->casenumber_idx)->f);
+ {
+ ds_put_format (&o->label,
+ "%ld",
+ (casenumber) case_data_idx (cx, bw->id_idx)->f);
+ }
ll_push_head (&bw->outliers, &o->ll);
}
@@ -111,9 +131,18 @@ box_whisker_outliers (const struct box_whisker *bw)
return &bw->outliers;
}
+/*
+ Create a box_whisker struct, suitable for generating a boxplot.
+
+ TH are the tukey hinges of the dataset.
+
+ id_idx is the index into the casereader which will be used to label
+ outliers.
+ id_var is the variable from which that label came, or NULL
+*/
struct box_whisker *
box_whisker_create (const struct tukey_hinges *th,
- const struct variable *id_var, size_t casenumber_idx)
+ size_t id_idx, const struct variable *id_var)
{
struct box_whisker *w = xzalloc (sizeof (*w));
struct order_stats *os = &w->parent;
@@ -126,7 +155,7 @@ box_whisker_create (const struct tukey_hinges *th,
tukey_hinges_calculate (th, w->hinges);
- w->casenumber_idx = casenumber_idx;
+ w->id_idx = id_idx;
w->id_var = id_var;
w->step = (w->hinges[2] - w->hinges[0]) * 1.5;