projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work on CTABLES
[pspp]
/
src
/
language
/
stats
/
runs.c
diff --git
a/src/language/stats/runs.c
b/src/language/stats/runs.c
index d12bd0d2b52a7239c5d4866bc726edc941e5f6a2..8a63b29c96b8e43a582267571e7adaad68e048f7 100644
(file)
--- a/
src/language/stats/runs.c
+++ b/
src/language/stats/runs.c
@@
-143,9
+143,9
@@
runs_execute (const struct dataset *ds,
struct ccase *c;
for (; (c = casereader_read (group)); case_unref (c))
{
struct ccase *c;
for (; (c = casereader_read (group)); case_unref (c))
{
- const double w = weight ? case_
data (c, weight)->f
: 1.0;
+ const double w = weight ? case_
num (c, weight)
: 1.0;
const union value *val = case_data (c, var);
const union value *val = case_data (c, var);
- if (var_is_value_missing (var, val
, exclude)
)
+ if (var_is_value_missing (var, val
) & exclude
)
continue;
x = val->f;
cc += w;
continue;
x = val->f;
cc += w;
@@
-191,8
+191,8
@@
runs_execute (const struct dataset *ds,
for (; (c = casereader_read (reader));)
{
const union value *val = case_data (c, var);
for (; (c = casereader_read (reader));)
{
const union value *val = case_data (c, var);
- const double w = weight ? case_
data (c, weight)->f
: 1.0;
- if (var_is_value_missing (var, val
, exclude)
)
+ const double w = weight ? case_
num (c, weight)
: 1.0;
+ if (var_is_value_missing (var, val
) & exclude
)
{
case_unref (c);
continue;
{
case_unref (c);
continue;
@@
-201,7
+201,7
@@
runs_execute (const struct dataset *ds,
cc += w;
casewriter_write (writer, c);
}
cc += w;
casewriter_write (writer, c);
}
- subcase_
destroy
(&sc);
+ subcase_
uninit
(&sc);
casereader_destroy (reader);
reader = casewriter_make_reader (writer);
casereader_destroy (reader);
reader = casewriter_make_reader (writer);
@@
-224,7
+224,7
@@
runs_execute (const struct dataset *ds,
struct casereader *reader = casereader_clone (input);
for (; (c = casereader_read (reader)); case_unref (c))
{
struct casereader *reader = casereader_clone (input);
for (; (c = casereader_read (reader)); case_unref (c))
{
- const double w = weight ? case_
data (c, weight)->f
: 1.0;
+ const double w = weight ? case_
num (c, weight)
: 1.0;
for (v = 0; v < otp->n_vars; ++v)
{
const struct variable *var = otp->vars[v];
for (v = 0; v < otp->n_vars; ++v)
{
const struct variable *var = otp->vars[v];
@@
-232,7
+232,7
@@
runs_execute (const struct dataset *ds,
const double x = val->f;
struct run_state *run = &rs[v];
const double x = val->f;
struct run_state *run = &rs[v];
- if (var_is_value_missing (var, val
, exclude)
)
+ if (var_is_value_missing (var, val
) & exclude
)
continue;
run->cutpoint += x * w;
continue;
run->cutpoint += x * w;
@@
-260,7
+260,7
@@
runs_execute (const struct dataset *ds,
for (; (c = casereader_read (input)); case_unref (c))
{
for (; (c = casereader_read (input)); case_unref (c))
{
- const double w = weight ? case_
data (c, weight)->f
: 1.0;
+ const double w = weight ? case_
num (c, weight)
: 1.0;
for (v = 0; v < otp->n_vars; ++v)
{
for (v = 0; v < otp->n_vars; ++v)
{
@@
-271,7
+271,7
@@
runs_execute (const struct dataset *ds,
double d = x - run->cutpoint;
short sign = 0;
double d = x - run->cutpoint;
short sign = 0;
- if (var_is_value_missing (var, val
, exclude)
)
+ if (var_is_value_missing (var, val
) & exclude
)
continue;
if (d >= 0)
continue;
if (d >= 0)