projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more work
[pspp]
/
src
/
math
/
box-whisker.c
diff --git
a/src/math/box-whisker.c
b/src/math/box-whisker.c
index 0d893cb80c14d98e4b7bf3c24c5603b4d23c5d27..506251682c7bf17106fba7525c2f6dc823ecac1c 100644
(file)
--- a/
src/math/box-whisker.c
+++ b/
src/math/box-whisker.c
@@
-40,7
+40,7
@@
destroy (struct statistic *s)
struct order_stats *os = &bw->parent;
struct ll *ll;
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);
{
struct outlier *e = ll_data (ll, struct outlier, ll);
@@
-61,24
+61,31
@@
acc (struct statistic *s, const struct ccase *cx,
{
struct box_whisker *bw = UP_CAST (s, struct box_whisker, parent.parent);
bool extreme;
{
struct box_whisker *bw = UP_CAST (s, struct box_whisker, parent.parent);
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) ;
+ }
+
+ else if (y < bw->hinges[0] - bw->step) /* Lower outlier */
+ {
+ extreme = (y < bw->hinges[0] - 2 * bw->step) ;
+ }
- if (bw->whiskers[0] == SYSMIS || bw->hinges[0] - bw->step > y)
- bw->whiskers[0] = y;
+ else /* Not an outlier */
+ {
+ if (bw->whiskers[0] == SYSMIS)
+ bw->whiskers[0] = y;
-
if ( y > bw->hinges[2] + bw->step
)
-
extreme = (y > bw->hinges[2] + 2 * bw->step)
;
+
if (y > bw->whiskers[1]
)
+
bw->whiskers[1] = y
;
- else if (y < bw->hinges[0] - bw->step)
- extreme = (y < bw->hinges[0] - 2 * bw->step) ;
+ return;
+ }
- else
- return;
+ /* y is an outlier */
-
o = xzalloc (sizeof *o)
;
+
struct outlier *o = XZALLOC (struct outlier)
;
o->value = y;
o->extreme = extreme;
ds_init_empty (&o->label);
o->value = y;
o->extreme = extreme;
ds_init_empty (&o->label);
@@
-86,8
+93,9
@@
acc (struct statistic *s, const struct ccase *cx,
if (bw->id_var)
{
char *s = data_out (case_data_idx (cx, bw->id_idx),
if (bw->id_var)
{
char *s = data_out (case_data_idx (cx, bw->id_idx),
- var_get_encoding (bw->id_var),
- var_get_print_format (bw->id_var));
+ var_get_encoding (bw->id_var),
+ var_get_print_format (bw->id_var),
+ settings_get_fmt_settings ());
ds_put_cstr (&o->label, s);
free (s);
ds_put_cstr (&o->label, s);
free (s);
@@
-96,7
+104,7
@@
acc (struct statistic *s, const struct ccase *cx,
{
ds_put_format (&o->label,
"%ld",
{
ds_put_format (&o->label,
"%ld",
- (casenumber) case_
data_idx (cx, bw->id_idx)->f
);
+ (casenumber) case_
num_idx (cx, bw->id_idx)
);
}
ll_push_head (&bw->outliers, &o->ll);
}
ll_push_head (&bw->outliers, &o->ll);
@@
-128,7
+136,7
@@
box_whisker_outliers (const struct box_whisker *bw)
TH are the tukey hinges of the dataset.
TH are the tukey hinges of the dataset.
- id_idx is the index into the casereader which will be used to label
+ 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
*/
outliers.
id_var is the variable from which that label came, or NULL
*/
@@
-136,7
+144,7
@@
struct box_whisker *
box_whisker_create (const struct tukey_hinges *th,
size_t id_idx, const struct variable *id_var)
{
box_whisker_create (const struct tukey_hinges *th,
size_t id_idx, const struct variable *id_var)
{
- struct box_whisker *w =
xzalloc (sizeof (*w)
);
+ struct box_whisker *w =
XZALLOC (struct box_whisker
);
struct order_stats *os = &w->parent;
struct statistic *stat = &os->parent;
struct order_stats *os = &w->parent;
struct statistic *stat = &os->parent;