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);
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) ;
o->value = y;
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_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);
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
*/