projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Distribute some files that were forgotten.
[pspp-builds.git]
/
src
/
language
/
stats
/
chisquare.c
diff --git
a/src/language/stats/chisquare.c
b/src/language/stats/chisquare.c
index 4593df4116eda81be5230a64ee2eee6c5f9fa15f..bc1b6474ff16c167d06ea94ca55de828475d7a9e 100644
(file)
--- a/
src/language/stats/chisquare.c
+++ b/
src/language/stats/chisquare.c
@@
-31,6
+31,7
@@
#include <language/stats/freq.h>
#include <language/stats/npar.h>
#include <libpspp/assertion.h>
#include <language/stats/freq.h>
#include <language/stats/npar.h>
#include <libpspp/assertion.h>
+#include <libpspp/cast.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
@@
-179,8
+180,8
@@
create_variable_frequency_table (const struct dictionary *dict,
return NULL;
}
return NULL;
}
- table = tab_create(4, n_cells + 2
, 0
);
- tab_dim (table, tab_natural_dimensions, NULL);
+ table = tab_create(4, n_cells + 2);
+ tab_dim (table, tab_natural_dimensions, NULL
, NULL
);
tab_title (table, var_to_string(var));
tab_text (table, 1, 0, TAB_LEFT, _("Observed N"));
tab_title (table, var_to_string(var));
tab_text (table, 1, 0, TAB_LEFT, _("Observed N"));
@@
-190,7
+191,7
@@
create_variable_frequency_table (const struct dictionary *dict,
tab_headers (table, 1, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, -1,
tab_headers (table, 1, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, -1,
- 0, 0, tab
le->nc
- 1, tab_nr(table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr(table) - 1 );
tab_hline (table, TAL_1, 0, tab_nc(table) - 1, 1);
tab_hline (table, TAL_1, 0, tab_nc(table) - 1, 1);
@@
-199,7
+200,7
@@
create_variable_frequency_table (const struct dictionary *dict,
tab_vline (table, TAL_1, i, 0, tab_nr(table) - 1);
tab_vline (table, TAL_1, i, 0, tab_nr(table) - 1);
- tab_text (table, 0, tab
le->nr
- 1, TAB_LEFT, _("Total"));
+ tab_text (table, 0, tab
_nr (table)
- 1, TAB_LEFT, _("Total"));
return table;
}
return table;
}
@@
-215,8
+216,8
@@
create_combo_frequency_table (const struct chisquare_test *test)
int n_cells = test->hi - test->lo + 1;
int n_cells = test->hi - test->lo + 1;
- table = tab_create(1 + ost->n_vars * 4, n_cells + 3
, 0
);
- tab_dim (table, tab_natural_dimensions, NULL);
+ table = tab_create(1 + ost->n_vars * 4, n_cells + 3);
+ tab_dim (table, tab_natural_dimensions, NULL
, NULL
);
tab_title (table, _("Frequencies"));
for ( i = 0 ; i < ost->n_vars ; ++i )
tab_title (table, _("Frequencies"));
for ( i = 0 ; i < ost->n_vars ; ++i )
@@
-254,12
+255,12
@@
create_combo_frequency_table (const struct chisquare_test *test)
tab_headers (table, 1, 0, 2, 0);
tab_box (table, TAL_1, TAL_1, -1, -1,
tab_headers (table, 1, 0, 2, 0);
tab_box (table, TAL_1, TAL_1, -1, -1,
- 0, 0, tab
le->nc
- 1, tab_nr(table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr(table) - 1 );
tab_hline (table, TAL_1, 1, tab_nc(table) - 1, 1);
tab_hline (table, TAL_1, 0, tab_nc(table) - 1, 2);
tab_hline (table, TAL_1, 1, tab_nc(table) - 1, 1);
tab_hline (table, TAL_1, 0, tab_nc(table) - 1, 2);
- tab_text (table, 0, tab
le->nr
- 1, TAB_LEFT, _("Total"));
+ tab_text (table, 0, tab
_nr (table)
- 1, TAB_LEFT, _("Total"));
return table;
}
return table;
}
@@
-271,8
+272,8
@@
create_stats_table (const struct chisquare_test *test)
const struct one_sample_test *ost = (const struct one_sample_test*) test;
struct tab_table *table;
const struct one_sample_test *ost = (const struct one_sample_test*) test;
struct tab_table *table;
- table = tab_create (1 + ost->n_vars, 4
, 0
);
- tab_dim (table, tab_natural_dimensions, NULL);
+ table = tab_create (1 + ost->n_vars, 4);
+ tab_dim (table, tab_natural_dimensions, NULL
, NULL
);
tab_title (table, _("Test Statistics"));
tab_headers (table, 1, 0, 1, 0);
tab_title (table, _("Test Statistics"));
tab_headers (table, 1, 0, 1, 0);
@@
-305,8
+306,9
@@
chisquare_execute (const struct dataset *ds,
{
const struct dictionary *dict = dataset_dict (ds);
int v, i;
{
const struct dictionary *dict = dataset_dict (ds);
int v, i;
- struct one_sample_test *ost = (struct one_sample_test *) test;
- struct chisquare_test *cst = (struct chisquare_test *) test;
+ struct chisquare_test *cst = UP_CAST (test, struct chisquare_test,
+ parent.parent);
+ struct one_sample_test *ost = &cst->parent;
int n_cells = 0;
double total_expected = 0.0;
const struct variable *wvar = dict_get_weight (dict);
int n_cells = 0;
double total_expected = 0.0;
const struct variable *wvar = dict_get_weight (dict);