projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the default help function.
[pspp]
/
src
/
math
/
box-whisker.c
diff --git
a/src/math/box-whisker.c
b/src/math/box-whisker.c
index 0d893cb80c14d98e4b7bf3c24c5603b4d23c5d27..53831824a09a32d0b5025607628983f7e1bba22e 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);
@@
-63,20
+63,28
@@
acc (struct statistic *s, const struct ccase *cx,
bool extreme;
struct outlier *o;
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;
o = xzalloc (sizeof *o) ;
o->value = y;
@@
-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
*/