projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MOMENTS: Avoid lexical corner case in test case.
[pspp-builds.git]
/
src
/
language
/
stats
/
binomial.c
diff --git
a/src/language/stats/binomial.c
b/src/language/stats/binomial.c
index f4344b76e86010603e10e0af33a12e8f717632af..b92018fdb400e9fe88d72ec93eed6d04d40d9bbe 100644
(file)
--- a/
src/language/stats/binomial.c
+++ b/
src/language/stats/binomial.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009
, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-16,7
+16,7
@@
#include <config.h>
#include <libpspp/compiler.h>
#include <config.h>
#include <libpspp/compiler.h>
-#include <output/tab
le
.h>
+#include <output/tab.h>
#include <data/format.h>
#include <data/case.h>
#include <data/format.h>
#include <data/case.h>
@@
-91,8
+91,8
@@
static bool
do_binomial (const struct dictionary *dict,
struct casereader *input,
const struct binomial_test *bst,
do_binomial (const struct dictionary *dict,
struct casereader *input,
const struct binomial_test *bst,
- struct freq
_mutable
*cat1,
- struct freq
_mutable
*cat2,
+ struct freq *cat1,
+ struct freq *cat2,
enum mv_class exclude
)
{
enum mv_class exclude
)
{
@@
-101,7
+101,7
@@
do_binomial (const struct dictionary *dict,
const struct one_sample_test *ost = (const struct one_sample_test *) bst;
struct ccase *c;
const struct one_sample_test *ost = (const struct one_sample_test *) bst;
struct ccase *c;
-
while ((c = casereader_read(input)) != NULL
)
+
for (; (c = casereader_read (input)) != NULL; case_unref (c)
)
{
int v;
double w = dict_get_case_weight (dict, c, &warn);
{
int v;
double w = dict_get_case_weight (dict, c, &warn);
@@
-109,41
+109,38
@@
do_binomial (const struct dictionary *dict,
for (v = 0 ; v < ost->n_vars ; ++v )
{
const struct variable *var = ost->vars[v];
for (v = 0 ; v < ost->n_vars ; ++v )
{
const struct variable *var = ost->vars[v];
- const union value *value = case_data (c, var);
- int width = var_get_width (var);
+ double value = case_num (c, var);
- if (var_is_
value
_missing (var, value, exclude))
+ if (var_is_
num
_missing (var, value, exclude))
continue;
if (bst->cutpoint != SYSMIS)
{
continue;
if (bst->cutpoint != SYSMIS)
{
- if ( c
ompare_values_short (cat1[v].value, value, var) >= 0
)
+ if ( c
at1[v].value.f >= value
)
cat1[v].count += w;
else
cat2[v].count += w;
}
else
{
cat1[v].count += w;
else
cat2[v].count += w;
}
else
{
- if (
NULL == cat1[v].value
)
+ if (
SYSMIS == cat1[v].value.f
)
{
{
- cat1[v].value
= value_dup (value, width)
;
+ cat1[v].value
.f = value
;
cat1[v].count = w;
}
cat1[v].count = w;
}
- else if (
0 == compare_values_short (cat1[v].value, value, var)
)
+ else if (
cat1[v].value.f == value
)
cat1[v].count += w;
cat1[v].count += w;
- else if (
NULL == cat2[v].value
)
+ else if (
SYSMIS == cat2[v].value.f
)
{
{
- cat2[v].value
= value_dup (value, width)
;
+ cat2[v].value
.f = value
;
cat2[v].count = w;
}
cat2[v].count = w;
}
- else if (
0 == compare_values_short (cat2[v].value, value, var)
)
+ else if (
cat2[v].value.f == value
)
cat2[v].count += w;
else if ( bst->category1 == SYSMIS)
msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
}
}
cat2[v].count += w;
else if ( bst->category1 == SYSMIS)
msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
}
}
-
- case_unref (c);
}
return casereader_destroy (input);
}
}
return casereader_destroy (input);
}
@@
-163,73
+160,60
@@
binomial_execute (const struct dataset *ds,
const struct binomial_test *bst = (const struct binomial_test *) test;
const struct one_sample_test *ost = (const struct one_sample_test*) test;
const struct binomial_test *bst = (const struct binomial_test *) test;
const struct one_sample_test *ost = (const struct one_sample_test*) test;
- struct freq
_mutable *cat1 = xzalloc (sizeof (*cat1) * ost->n_vars)
;
-
struct freq_mutable *cat2 = xzalloc (sizeof (*cat1) * ost->n_vars)
;
+ struct freq
*cat[2]
;
+
int i
;
assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
- if ( bst->cutpoint != SYSMIS )
- {
- int i;
- union value v;
- v.f = bst->cutpoint;
- for (i = 0; i < ost->n_vars; i++)
- cat1[i].value = value_dup (&v, 0);
- }
- else if ( bst->category1 != SYSMIS )
+ for (i = 0; i < 2; i++)
{
{
- int i;
- union value v;
- v.f = bst->category1;
- for (i = 0; i < ost->n_vars; i++)
- cat1[i].value = value_dup (&v, 0);
- }
-
- if ( bst->category2 != SYSMIS )
- {
- int i;
- union value v;
- v.f = bst->category2;
- for (i = 0; i < ost->n_vars; i++)
- cat2[i].value = value_dup (&v, 0);
+ double value;
+ if (i == 0)
+ value = bst->cutpoint != SYSMIS ? bst->cutpoint : bst->category1;
+ else
+ value = bst->category2;
+
+ cat[i] = xnmalloc (ost->n_vars, sizeof *cat[i]);
+ for (v = 0; v < ost->n_vars; v++)
+ {
+ cat[i][v].value.f = value;
+ cat[i][v].count = 0;
+ }
}
}
- if (do_binomial (d
ict, input, bst, cat1, cat2
, exclude))
+ if (do_binomial (d
ataset_dict (ds), input, bst, cat[0], cat[1]
, exclude))
{
const struct variable *wvar = dict_get_weight (dict);
const struct fmt_spec *wfmt = wvar ?
var_get_print_format (wvar) : & F_8_0;
{
const struct variable *wvar = dict_get_weight (dict);
const struct fmt_spec *wfmt = wvar ?
var_get_print_format (wvar) : & F_8_0;
- struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1, 0);
-
- tab_dim (table, tab_natural_dimensions);
+ struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1);
tab_title (table, _("Binomial Test"));
tab_headers (table, 2, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, TAL_1,
tab_title (table, _("Binomial Test"));
tab_headers (table, 2, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, TAL_1,
- 0, 0, tab
le->nc
- 1, tab_nr(table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr(table) - 1 );
for (v = 0 ; v < ost->n_vars; ++v)
{
double n_total, sig;
for (v = 0 ; v < ost->n_vars; ++v)
{
double n_total, sig;
- struct string catstr1;
- struct string catstr2;
+ struct string catstr[2];
const struct variable *var = ost->vars[v];
const struct variable *var = ost->vars[v];
- ds_init_empty (&catstr
1
);
- ds_init_empty (&catstr
2
);
+ ds_init_empty (&catstr
[0]
);
+ ds_init_empty (&catstr
[1]
);
if ( bst->cutpoint != SYSMIS)
{
if ( bst->cutpoint != SYSMIS)
{
- ds_put_format (&catstr1, "<= %g", bst->cutpoint);
- }
- else
- {
- var_append_value_name (var, cat1[v].value, &catstr1);
- var_append_value_name (var, cat2[v].value, &catstr2);
+ ds_put_format (&catstr[0], "<= %g", bst->cutpoint);
}
}
+ else
+ {
+ var_append_value_name (var, &cat[0][v].value, &catstr[0]);
+ var_append_value_name (var, &cat[1][v].value, &catstr[1]);
+ }
tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3);
tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3);
@@
-243,31
+227,31
@@
binomial_execute (const struct dataset *ds,
tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL);
/* Category labels */
tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL);
/* Category labels */
- tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr
1
));
- tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr
2
));
+ tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr
[0]
));
+ tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr
[1]
));
/* Observed N */
/* Observed N */
- tab_double (table, 3, 1 + v * 3, TAB_NONE, cat
1
[v].count, wfmt);
- tab_double (table, 3, 2 + v * 3, TAB_NONE, cat
2
[v].count, wfmt);
+ tab_double (table, 3, 1 + v * 3, TAB_NONE, cat
[0]
[v].count, wfmt);
+ tab_double (table, 3, 2 + v * 3, TAB_NONE, cat
[1]
[v].count, wfmt);
- n_total = cat
1[v].count + cat2
[v].count;
+ n_total = cat
[0][v].count + cat[1]
[v].count;
tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, wfmt);
/* Observed Proportions */
tab_double (table, 4, 1 + v * 3, TAB_NONE,
tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, wfmt);
/* Observed Proportions */
tab_double (table, 4, 1 + v * 3, TAB_NONE,
- cat
1
[v].count / n_total, NULL);
+ cat
[0]
[v].count / n_total, NULL);
tab_double (table, 4, 2 + v * 3, TAB_NONE,
tab_double (table, 4, 2 + v * 3, TAB_NONE,
- cat
2
[v].count / n_total, NULL);
+ cat
[1]
[v].count / n_total, NULL);
tab_double (table, 4, 3 + v * 3, TAB_NONE,
tab_double (table, 4, 3 + v * 3, TAB_NONE,
- (cat
1[v].count + cat2
[v].count) / n_total, NULL);
+ (cat
[0][v].count + cat[1]
[v].count) / n_total, NULL);
/* Significance */
/* Significance */
- sig = calculate_binomial (cat
1[v].count, cat2
[v].count, bst->p);
+ sig = calculate_binomial (cat
[0][v].count, cat[1]
[v].count, bst->p);
tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL);
tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL);
- ds_destroy (&catstr
1
);
- ds_destroy (&catstr
2
);
+ ds_destroy (&catstr
[0]
);
+ ds_destroy (&catstr
[1]
);
}
tab_text (table, 2, 0, TAB_CENTER, _("Category"));
}
tab_text (table, 2, 0, TAB_CENTER, _("Category"));
@@
-275,19
+259,14
@@
binomial_execute (const struct dataset *ds,
tab_text (table, 4, 0, TAB_CENTER, _("Observed Prop."));
tab_text (table, 5, 0, TAB_CENTER, _("Test Prop."));
tab_text (table, 4, 0, TAB_CENTER, _("Observed Prop."));
tab_text (table, 5, 0, TAB_CENTER, _("Test Prop."));
- tab_text
(table, 6, 0, TAB_CENTER | TAT_PRINTF
,
- _("Exact Sig. (%d-tailed)"),
-
bst->p == 0.5 ? 2
: 1);
+ tab_text
_format (table, 6, 0, TAB_CENTER
,
+
_("Exact Sig. (%d-tailed)"),
+
bst->p == 0.5 ? 2
: 1);
tab_vline (table, TAL_2, 2, 0, tab_nr (table) -1);
tab_submit (table);
}
tab_vline (table, TAL_2, 2, 0, tab_nr (table) -1);
tab_submit (table);
}
- for (v = 0; v < ost->n_vars; v++)
- {
- free (cat1[v].value);
- free (cat2[v].value);
- }
- free (cat1);
- free (cat2);
+ for (i = 0; i < 2; i++)
+ free (cat[i]);
}
}