projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FACTOR: Don't try to perform analysis if there are no variables.
[pspp]
/
src
/
math
/
trimmed-mean.c
diff --git
a/src/math/trimmed-mean.c
b/src/math/trimmed-mean.c
index 2d44d0dc08cc3bba114f4ed9004c17eaf9ae6a7f..a687dd9b5fcffcd711ed983d0566edbb54847213 100644
(file)
--- a/
src/math/trimmed-mean.c
+++ b/
src/math/trimmed-mean.c
@@
-33,11
+33,11
@@
acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, do
struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent);
struct order_stats *os = &tm->parent;
struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent);
struct order_stats *os = &tm->parent;
- if ( cc > os->k[0].tc && cc < os->k[1].tc)
-
tm->sum += c * y;
+ if ( cc > os->k[0].tc && cc <
=
os->k[1].tc)
+ tm->sum += c * y;
- if ( tm->cyk1p1 == SYSMIS && cc >os->k[0].tc)
-
tm->cyk1p1 = c * y;
+ if ( tm->cyk1p1 == SYSMIS && cc >
os->k[0].tc)
+ tm->cyk1p1 = c * y;
}
static void
}
static void
@@
-83,14
+83,11
@@
trimmed_mean_calculate (const struct trimmed_mean *tm)
return
(
return
(
- (os->k[0].cc_p1 - os->k[0].tc) * os->k[0].y_p1
- -
- (os->k[1].cc - os->k[1].tc) * os->k[1].y_p1
+ (os->k[0].cc - os->k[0].tc) * os->k[0].y_p1
+
+
- tm->sum
- -
- tm->cyk1p1
+ (tm->w - os->k[1].cc - os->k[0].tc) * os->k[1].y_p1
+ +
+ tm->sum
)
)
- /
- ( (1.0 - 2 * tm->tail) * tm->w);
+ / ((1.0 - tm->tail * 2) * tm->w);
}
}