X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foneway.q;h=f413cda15410af5bc0bcd269cfb64c03fbd676c4;hb=6331aa1af5f813fbe463fd0970c39a35c5243332;hp=71f5f08730cd0af78e17734f499e516135ce1812;hpb=1195caf0c998e80d3e7195a0452a14e7b4194077;p=pspp diff --git a/src/oneway.q b/src/oneway.q index 71f5f08730..f413cda154 100644 --- a/src/oneway.q +++ b/src/oneway.q @@ -43,6 +43,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include "group_proc.h" #include "group.h" #include "levene.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* (headers) */ /* (specification) @@ -67,7 +71,7 @@ static struct cmd_oneway cmd; static struct variable *indep_var; /* Number of dependent variables */ -static int n_vars; +static size_t n_vars; /* The dependent variables */ static struct variable **vars; @@ -83,7 +87,7 @@ static int ostensible_number_of_groups=-1; /* Function to use for testing for missing values */ -static is_missing_func value_is_missing; +static is_missing_func *value_is_missing; static void run_oneway(const struct casefile *cf, void *_mode); @@ -115,9 +119,9 @@ cmd_oneway(void) /* If /MISSING=INCLUDE is set, then user missing values are ignored */ if (cmd.incl == ONEWAY_INCLUDE ) - value_is_missing = is_system_missing; + value_is_missing = mv_is_value_system_missing; else - value_is_missing = is_missing; + value_is_missing = mv_is_value_missing; /* What statistics were requested */ if ( cmd.sbc_statistics ) @@ -150,11 +154,10 @@ cmd_oneway(void) void output_oneway(void) { - - int i; + size_t i; short *bad_contrast ; - bad_contrast = xmalloc ( sizeof (short) * cmd.sbc_contrast ); + bad_contrast = xnmalloc (cmd.sbc_contrast, sizeof *bad_contrast); /* Check the sanity of the given contrast values */ for (i = 0 ; i < cmd.sbc_contrast ; ++i ) @@ -254,9 +257,9 @@ oneway_custom_variables(struct cmd_oneway *cmd UNUSED) static void show_anova_table(void) { - int i; + size_t i; int n_cols =7; - int n_rows = n_vars * 3 + 1; + size_t n_rows = n_vars * 3 + 1; struct tab_table *t; @@ -290,7 +293,7 @@ show_anova_table(void) struct hsh_iterator g; struct group_statistics *gs; double ssa=0; - + const char *s = var_to_string(vars[i]); for (gs = hsh_first (group_hash,&g); gs != 0; @@ -301,8 +304,6 @@ show_anova_table(void) ssa -= ( totals->sum * totals->sum ) / totals->n ; - const char *s = var_to_string(vars[i]); - tab_text (t, 0, i * 3 + 1, TAB_LEFT | TAT_TITLE, s); tab_text (t, 1, i * 3 + 1, TAB_LEFT | TAT_TITLE, _("Between Groups")); tab_text (t, 1, i * 3 + 2, TAB_LEFT | TAT_TITLE, _("Within Groups")); @@ -362,7 +363,7 @@ show_anova_table(void) static void show_descriptives(void) { - int v; + size_t v; int n_cols =10; struct tab_table *t; int row; @@ -425,7 +426,7 @@ show_descriptives(void) const char *s = var_to_string(vars[v]); - struct group_statistics **gs_array = hsh_sort(gp->group_hash); + struct group_statistics *const *gs_array = hsh_sort(gp->group_hash); int count = 0; tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s); @@ -509,9 +510,9 @@ show_descriptives(void) static void show_homogeneity(void) { - int v; + size_t v; int n_cols = 5; - int n_rows = n_vars + 1; + size_t n_rows = n_vars + 1; struct tab_table *t; @@ -576,7 +577,7 @@ show_contrast_coeffs(short *bad_contrast) int n_rows = 2 + cmd.sbc_contrast; union value *group_value; int count = 0 ; - void **group_values ; + void *const *group_values ; struct tab_table *t; @@ -648,9 +649,9 @@ show_contrast_coeffs(short *bad_contrast) static void show_contrast_tests(short *bad_contrast) { - int v; + size_t v; int n_cols = 8; - int n_rows = 1 + n_vars * 2 * cmd.sbc_contrast; + size_t n_rows = 1 + n_vars * 2 * cmd.sbc_contrast; struct tab_table *t; @@ -700,8 +701,8 @@ show_contrast_tests(short *bad_contrast) double coef_msq = 0.0; struct group_proc *grp_data = group_proc_get (vars[v]); struct hsh_table *group_hash = grp_data->group_hash; - struct group_statistics *gs; - void **group_stat_array; + + void *const *group_stat_array; double T; double std_error_contrast ; @@ -748,9 +749,9 @@ show_contrast_tests(short *bad_contrast) for (ci = 0 ; ci < hsh_count(group_hash) ; ++ci) { - gs = group_stat_array[ci]; - - const double coef = subc_list_double_at(&cmd.dl_contrast[i],ci); + const double coef = subc_list_double_at(&cmd.dl_contrast[i], ci); + struct group_statistics *gs = group_stat_array[ci]; + const double winv = (gs->std_dev * gs->std_dev) / gs->n; contrast_value += coef * gs->mean; @@ -855,7 +856,7 @@ static void precalc ( struct cmd_oneway *cmd UNUSED ); static void precalc ( struct cmd_oneway *cmd UNUSED ) { - int i=0; + size_t i=0; for(i=0; i< n_vars ; ++i) { @@ -903,7 +904,7 @@ run_oneway(const struct casefile *cf, void *cmd_) casereader_read (r, &c) ; case_destroy (&c)) { - int i; + size_t i; const double weight = dict_get_case_weight(default_dict,&c,&bad_weight_warn); @@ -911,7 +912,7 @@ run_oneway(const struct casefile *cf, void *cmd_) const union value *indep_val = case_data (&c, indep_var->fv); /* Deal with missing values */ - if ( value_is_missing(indep_val,indep_var) ) + if ( value_is_missing(&indep_var->miss, indep_val) ) continue; /* Skip the entire case if /MISSING=LISTWISE is set */ @@ -922,7 +923,7 @@ run_oneway(const struct casefile *cf, void *cmd_) const struct variable *v = vars[i]; const union value *val = case_data (&c, v->fv); - if (value_is_missing(val,v) ) + if (value_is_missing(&v->miss, val) ) break; } if ( i != n_vars ) @@ -948,9 +949,7 @@ run_oneway(const struct casefile *cf, void *cmd_) if ( ! gs ) { - gs = (struct group_statistics *) - xmalloc (sizeof(struct group_statistics)); - + gs = xmalloc (sizeof *gs); gs->id = *indep_val; gs->sum=0; gs->n=0; @@ -962,7 +961,7 @@ run_oneway(const struct casefile *cf, void *cmd_) hsh_insert ( group_hash, (void *) gs ); } - if (! value_is_missing(val,v) ) + if (! value_is_missing(&v->miss, val) ) { struct group_statistics *totals = &gp->ugs; @@ -1014,7 +1013,7 @@ run_oneway(const struct casefile *cf, void *cmd_) void postcalc ( struct cmd_oneway *cmd UNUSED ) { - int i=0; + size_t i=0; for(i = 0; i < n_vars ; ++i)