X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foneway.q;h=27703055d704e709ea0d2bdcc244d0a7e46da52c;hb=e4eec8a0e8e5d06d3e375e4df98b7d9f74edd9f1;hp=17476cc786a827af69222dfd08f794277a356345;hpb=205eaea8e2d95e20baa2c00a495b0ac4f9646372;p=pspp diff --git a/src/oneway.q b/src/oneway.q index 17476cc786..27703055d7 100644 --- a/src/oneway.q +++ b/src/oneway.q @@ -1,22 +1,22 @@ /* PSPP - One way ANOVA. -*-c-*- - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Author: John Darrington 2004 +Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. +Author: John Darrington 2004 - 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. +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 the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #include #include @@ -27,6 +27,7 @@ #include "alloc.h" #include "str.h" #include "case.h" +#include "dictionary.h" #include "command.h" #include "lexer.h" #include "error.h" @@ -39,17 +40,18 @@ #include "vfm.h" #include "hash.h" #include "casefile.h" -#include "oneway.h" +#include "group_proc.h" #include "group.h" #include "levene.h" +/* (headers) */ /* (specification) "ONEWAY" (oneway_): - *variables=custom; - +missing=miss:!analysis/listwise, - incl:include/!exclude; - contrast= double list; - statistics[st_]=descriptives,homogeneity. + *^variables=custom; + +missing=miss:!analysis/listwise, + incl:include/!exclude; + contrast= double list; + statistics[st_]=descriptives,homogeneity. */ /* (declarations) */ /* (functions) */ @@ -84,16 +86,23 @@ static int ostensible_number_of_groups=-1; static is_missing_func value_is_missing; -static void calculate(const struct casefile *cf, void *_mode); +static void run_oneway(const struct casefile *cf, void *_mode); /* Routines to show the output tables */ static void show_anova_table(void); static void show_descriptives(void); static void show_homogeneity(void); -static void show_contrast_coeffs(void); -static void show_contrast_tests(void); +static void show_contrast_coeffs(short *); +static void show_contrast_tests(short *); + + +enum stat_table_t {STAT_DESC = 1, STAT_HOMO = 2}; + +static enum stat_table_t stat_tables ; + +void output_oneway(void); int @@ -110,7 +119,42 @@ cmd_oneway(void) else value_is_missing = is_missing; - multipass_procedure_with_splits (calculate, &cmd); + /* What statistics were requested */ + if ( cmd.sbc_statistics ) + { + + for (i = 0 ; i < ONEWAY_ST_count ; ++i ) + { + if ( ! cmd.a_statistics[i] ) continue; + + switch (i) { + case ONEWAY_ST_DESCRIPTIVES: + stat_tables |= STAT_DESC; + break; + case ONEWAY_ST_HOMOGENEITY: + stat_tables |= STAT_HOMO; + break; + } + } + } + + multipass_procedure_with_splits (run_oneway, &cmd); + + free (vars); + free_oneway (&cmd); + + return CMD_SUCCESS; +} + + +void +output_oneway(void) +{ + + int i; + short *bad_contrast ; + + bad_contrast = xmalloc ( sizeof (short) * cmd.sbc_contrast ); /* Check the sanity of the given contrast values */ for (i = 0 ; i < cmd.sbc_contrast ; ++i ) @@ -118,12 +162,14 @@ cmd_oneway(void) int j; double sum = 0; + bad_contrast[i] = 0; if ( subc_list_double_count(&cmd.dl_contrast[i]) != ostensible_number_of_groups ) { - msg(SE, + msg(SW, _("Number of contrast coefficients must equal the number of groups")); - return CMD_FAILURE; + bad_contrast[i] = 1; + continue; } for (j=0; j < ostensible_number_of_groups ; ++j ) @@ -133,53 +179,38 @@ cmd_oneway(void) msg(SW,_("Coefficients for contrast %d do not total zero"),i + 1); } + if ( stat_tables & STAT_DESC ) + show_descriptives(); - - /* Show the statistics tables */ - if ( cmd.sbc_statistics ) - { - for (i = 0 ; i < ONEWAY_ST_count ; ++i ) - { - if ( ! cmd.a_statistics[i] ) continue; - - switch (i) { - case ONEWAY_ST_DESCRIPTIVES: - show_descriptives(); - break; - case ONEWAY_ST_HOMOGENEITY: - show_homogeneity(); - break; - } - } - } - + if ( stat_tables & STAT_HOMO ) + show_homogeneity(); show_anova_table(); - if (cmd.sbc_contrast) + if (cmd.sbc_contrast ) { - show_contrast_coeffs(); - show_contrast_tests(); + show_contrast_coeffs(bad_contrast); + show_contrast_tests(bad_contrast); } + free(bad_contrast); + /* Clean up */ for (i = 0 ; i < n_vars ; ++i ) { - struct hsh_table *group_hash = vars[i]->p.ww.group_hash; + struct hsh_table *group_hash = group_proc_get (vars[i])->group_hash; hsh_destroy(group_hash); } hsh_destroy(global_group_hash); - return CMD_SUCCESS; } - /* Parser for the variables sub command */ static int oneway_custom_variables(struct cmd_oneway *cmd UNUSED) @@ -254,25 +285,22 @@ show_anova_table(void) for ( i=0 ; i < n_vars ; ++i ) { - struct group_statistics *totals = &vars[i]->p.ww.ugs; - struct hsh_table *group_hash = vars[i]->p.ww.group_hash; + struct group_statistics *totals = &group_proc_get (vars[i])->ugs; + struct hsh_table *group_hash = group_proc_get (vars[i])->group_hash; 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; gs = hsh_next(group_hash,&g)) - { - ssa += (gs->sum * gs->sum)/gs->n; - } + { + ssa += (gs->sum * gs->sum)/gs->n; + } ssa -= ( totals->sum * totals->sum ) / totals->n ; - const char *s = (vars[i]->label) ? vars[i]->label : vars[i]->name; - - 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")); @@ -282,12 +310,13 @@ show_anova_table(void) tab_hline(t, TAL_1, 0, n_cols - 1 , i * 3 + 1); { + struct group_proc *gp = group_proc_get (vars[i]); const double sst = totals->ssq - ( totals->sum * totals->sum) / totals->n ; - const double df1 = vars[i]->p.ww.n_groups - 1; - const double df2 = totals->n - vars[i]->p.ww.n_groups ; + const double df1 = gp->n_groups - 1; + const double df2 = totals->n - gp->n_groups ; const double msa = ssa / df1; - vars[i]->p.ww.mse = (sst - ssa) / df2; + gp->mse = (sst - ssa) / df2; /* Sums of Squares */ @@ -303,11 +332,11 @@ show_anova_table(void) /* Mean Squares */ tab_float (t, 4, i * 3 + 1, TAB_RIGHT, msa, 8, 3); - tab_float (t, 4, i * 3 + 2, TAB_RIGHT, vars[i]->p.ww.mse, 8, 3); + tab_float (t, 4, i * 3 + 2, TAB_RIGHT, gp->mse, 8, 3); { - const double F = msa/vars[i]->p.ww.mse ; + const double F = msa/gp->mse ; /* The F value */ tab_float (t, 5, i * 3 + 1, 0, F, 8, 3); @@ -342,10 +371,8 @@ show_descriptives(void) int n_rows = 2 ; - - for ( v = 0 ; v < n_vars ; ++v ) - n_rows += vars[v]->p.ww.n_groups + 1; + n_rows += group_proc_get (vars[v])->n_groups + 1; t = tab_create (n_cols,n_rows,0); tab_headers (t, 2, 0, 2, 0); @@ -387,40 +414,28 @@ show_descriptives(void) for ( v=0 ; v < n_vars ; ++v ) { double T; - double stderr; - + double std_error; + + struct group_proc *gp = group_proc_get (vars[v]); - struct hsh_iterator g; struct group_statistics *gs; - struct group_statistics *totals = &vars[v]->p.ww.ugs; + struct group_statistics *totals = &gp->ugs; - int count = 0 ; - char *s = (vars[v]->label) ? vars[v]->label : vars[v]->name; - - struct hsh_table *group_hash = vars[v]->p.ww.group_hash; + const char *s = var_to_string(vars[v]); + struct group_statistics **gs_array = hsh_sort(gp->group_hash); + int count = 0; tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s); if ( v > 0) tab_hline(t, TAL_1, 0, n_cols - 1 , row); - - for (gs = hsh_first (group_hash,&g); - gs != 0; - gs = hsh_next(group_hash,&g)) + for (count = 0 ; count < hsh_count(gp->group_hash) ; ++count) { - const char *s = val_labs_find(indep_var->val_labs, gs->id ); - - if ( s ) - tab_text (t, 1, row + count, - TAB_LEFT | TAT_TITLE ,s); - else if ( indep_var->width != 0 ) - tab_text (t, 1, row + count, - TAB_LEFT | TAT_TITLE, gs->id.s); - else - tab_text (t, 1, row + count, - TAB_LEFT | TAT_TITLE | TAT_PRINTF, "%g", gs->id.f); - + gs = gs_array[count]; + + tab_text (t, 1, row + count, + TAB_LEFT | TAT_TITLE ,value_to_string(&gs->id,indep_var)); /* Now fill in the numbers ... */ @@ -430,30 +445,29 @@ show_descriptives(void) tab_float (t, 4, row + count, 0, gs->std_dev,8,2); - stderr = gs->std_dev/sqrt(gs->n) ; + std_error = gs->std_dev/sqrt(gs->n) ; tab_float (t, 5, row + count, 0, - stderr, 8,2); + std_error, 8,2); /* Now the confidence interval */ T = gsl_cdf_tdist_Qinv(q,gs->n - 1); tab_float(t, 6, row + count, 0, - gs->mean - T * stderr, 8, 2); + gs->mean - T * std_error, 8, 2); tab_float(t, 7, row + count, 0, - gs->mean + T * stderr, 8, 2); + gs->mean + T * std_error, 8, 2); /* Min and Max */ tab_float(t, 8, row + count, 0, gs->minimum, 8, 2); tab_float(t, 9, row + count, 0, gs->maximum, 8, 2); - count++ ; } tab_text (t, 1, row + count, - TAB_LEFT | TAT_TITLE ,_("Total")); + TAB_LEFT | TAT_TITLE ,_("Total")); tab_float (t, 2, row + count, 0, totals->n, 8,0); @@ -461,26 +475,26 @@ show_descriptives(void) tab_float (t, 4, row + count, 0, totals->std_dev,8,2); - stderr = totals->std_dev/sqrt(totals->n) ; + std_error = totals->std_dev/sqrt(totals->n) ; - tab_float (t, 5, row + count, 0, stderr, 8,2); + tab_float (t, 5, row + count, 0, std_error, 8,2); /* Now the confidence interval */ T = gsl_cdf_tdist_Qinv(q,totals->n - 1); tab_float(t, 6, row + count, 0, - totals->mean - T * stderr, 8, 2); + totals->mean - T * std_error, 8, 2); tab_float(t, 7, row + count, 0, - totals->mean + T * stderr, 8, 2); + totals->mean + T * std_error, 8, 2); /* Min and Max */ tab_float(t, 8, row + count, 0, totals->minimum, 8, 2); tab_float(t, 9, row + count, 0, totals->maximum, 8, 2); - row += vars[v]->p.ww.n_groups + 1; + row += gp->n_groups + 1; } @@ -526,9 +540,24 @@ show_homogeneity(void) for ( v=0 ; v < n_vars ; ++v ) { - char *s = (vars[v]->label) ? vars[v]->label : vars[v]->name; + double F; + const struct variable *var = vars[v]; + const struct group_proc *gp = group_proc_get (vars[v]); + const char *s = var_to_string(var); + const struct group_statistics *totals = &gp->ugs; + + const double df1 = gp->n_groups - 1; + const double df2 = totals->n - gp->n_groups ; tab_text (t, 0, v + 1, TAB_LEFT | TAT_TITLE, s); + + F = gp->levene; + tab_float (t, 1, v + 1, TAB_RIGHT, F, 8,3); + tab_float (t, 2, v + 1, TAB_RIGHT, df1 ,8,0); + tab_float (t, 3, v + 1, TAB_RIGHT, df2 ,8,0); + + /* Now the significance */ + tab_float (t, 4, v + 1, TAB_RIGHT,gsl_cdf_fdist_Q(F,df1,df2), 8, 3); } tab_submit (t); @@ -539,19 +568,16 @@ show_homogeneity(void) /* Show the contrast coefficients table */ static void -show_contrast_coeffs(void) +show_contrast_coeffs(short *bad_contrast) { - char *s; int n_cols = 2 + ostensible_number_of_groups; int n_rows = 2 + cmd.sbc_contrast; - struct hsh_iterator g; union value *group_value; int count = 0 ; - + void **group_values ; struct tab_table *t; - t = tab_create (n_cols,n_rows,0); tab_headers (t, 2, 0, 2, 0); tab_dim (t, tab_natural_dimensions); @@ -563,7 +589,6 @@ show_contrast_coeffs(void) 0, 0, n_cols - 1, n_rows - 1); - tab_box (t, -1,-1, TAL_0, TAL_0, @@ -576,57 +601,50 @@ show_contrast_coeffs(void) 0,0, 1,1); - tab_hline(t, TAL_1, 2, n_cols - 1, 1); - - tab_hline(t, TAL_2, 0, n_cols - 1, 2); - tab_vline(t, TAL_2, 2, 0, n_rows - 1); + tab_vline(t, TAL_2, 2, 0, n_rows - 1); tab_title (t, 0, _("Contrast Coefficients")); tab_text (t, 0, 2, TAB_LEFT | TAT_TITLE, _("Contrast")); - s = (indep_var->label) ? indep_var->label : indep_var->name; - tab_joint_text (t, 2, 0, n_cols - 1, 0, TAB_CENTER | TAT_TITLE, s); + tab_joint_text (t, 2, 0, n_cols - 1, 0, TAB_CENTER | TAT_TITLE, + var_to_string(indep_var)); - for (group_value = hsh_first (global_group_hash,&g); - group_value != 0; - group_value = hsh_next(global_group_hash,&g)) + group_values = hsh_sort(global_group_hash); + for (count = 0 ; + count < hsh_count(global_group_hash) ; + ++count) { int i; - char *lab; + group_value = group_values[count]; - lab = val_labs_find(indep_var->val_labs,*group_value); - - if ( lab ) - tab_text (t, count + 2, 1, - TAB_CENTER | TAT_TITLE ,lab); - else - tab_text (t, count + 2, 1, - TAB_CENTER | TAT_TITLE | TAT_PRINTF, "%g", group_value->f); + tab_text (t, count + 2, 1, TAB_CENTER | TAT_TITLE, + value_to_string(group_value, indep_var)); for (i = 0 ; i < cmd.sbc_contrast ; ++i ) { tab_text(t, 1, i + 2, TAB_CENTER | TAT_PRINTF, "%d", i + 1); - tab_text(t, count + 2, i + 2, TAB_RIGHT | TAT_PRINTF, "%g", - subc_list_double_at(&cmd.dl_contrast[i],count) - ); + + if ( bad_contrast[i] ) + tab_text(t, count + 2, i + 2, TAB_RIGHT, "?" ); + else + tab_text(t, count + 2, i + 2, TAB_RIGHT | TAT_PRINTF, "%g", + subc_list_double_at(&cmd.dl_contrast[i], count) + ); } - - count++ ; } - + tab_submit (t); - } /* Show the results of the contrast tests */ static void -show_contrast_tests(void) +show_contrast_tests(short *bad_contrast) { int v; int n_cols = 8; @@ -671,25 +689,37 @@ show_contrast_tests(void) tab_text (t, 0, (v * lines_per_variable) + 1, TAB_LEFT | TAT_TITLE, - vars[v]->label?vars[v]->label:vars[v]->name); - - + var_to_string(vars[v])); for ( i = 0 ; i < cmd.sbc_contrast ; ++i ) { int ci; double contrast_value = 0.0; double coef_msq = 0.0; - struct oneway_proc *ww = &vars[v]->p.ww ; - struct hsh_table *group_hash = ww->group_hash; - struct hsh_iterator g; - struct group_statistics *gs; + struct group_proc *grp_data = group_proc_get (vars[v]); + struct hsh_table *group_hash = grp_data->group_hash; + + void **group_stat_array; double T; - double stderr_contrast ; + double std_error_contrast ; double df; - - + double sec_vneq=0.0; + + + /* Note: The calculation of the degrees of freedom in the + "variances not equal" case is painfull!! + The following formula may help to understand it: + \frac{\left(\sum_{i=1}^k{c_i^2\frac{s_i^2}{n_i}}\right)^2} + { + \sum_{i=1}^k\left( + \frac{\left(c_i^2\frac{s_i^2}{n_i}\right)^2} {n_i-1} + \right) + } + */ + + double df_denominator = 0.0; + double df_numerator = 0.0; if ( i == 0 ) { tab_text (t, 1, (v * lines_per_variable) + i + 1, @@ -708,35 +738,47 @@ show_contrast_tests(void) tab_text (t, 2, (v * lines_per_variable) + i + 1 + cmd.sbc_contrast, TAB_CENTER | TAT_TITLE | TAT_PRINTF, "%d",i+1); - /* FIXME: Potential danger here. - We're ASSUMING THE array is in the order corresponding to the - hash order. */ - for (ci = 0, gs = hsh_first (group_hash,&g); - gs != 0; - ++ci, gs = hsh_next(group_hash,&g)) + + if ( bad_contrast[i]) + continue; + + group_stat_array = hsh_sort(group_hash); + + for (ci = 0 ; ci < hsh_count(group_hash) ; ++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; coef_msq += (coef * coef) / gs->n ; + + sec_vneq += (coef * coef) * (gs->std_dev * gs->std_dev ) /gs->n ; + + df_numerator += (coef * coef) * winv; + df_denominator += pow2((coef * coef) * winv) / (gs->n - 1); } + sec_vneq = sqrt(sec_vneq); + + df_numerator = pow2(df_numerator); tab_float (t, 3, (v * lines_per_variable) + i + 1, TAB_RIGHT, contrast_value, 8,2); - tab_float (t, 3, (v * lines_per_variable) + i + 1 + cmd.sbc_contrast, + tab_float (t, 3, (v * lines_per_variable) + i + 1 + + cmd.sbc_contrast, TAB_RIGHT, contrast_value, 8,2); - - stderr_contrast = sqrt(vars[v]->p.ww.mse * coef_msq); + std_error_contrast = sqrt(grp_data->mse * coef_msq); /* Std. Error */ tab_float (t, 4, (v * lines_per_variable) + i + 1, - TAB_RIGHT, stderr_contrast, + TAB_RIGHT, std_error_contrast, 8,3); - T = fabs(contrast_value / stderr_contrast) ; + T = fabs(contrast_value / std_error_contrast) ; /* T Statistic */ @@ -744,7 +786,7 @@ show_contrast_tests(void) TAB_RIGHT, T, 8,3); - df = ww->ugs.n - ww->n_groups; + df = grp_data->ugs.n - grp_data->n_groups; /* Degrees of Freedom */ tab_float (t, 6, (v * lines_per_variable) + i + 1, @@ -757,51 +799,54 @@ show_contrast_tests(void) TAB_RIGHT, 2 * gsl_cdf_tdist_Q(T,df), 8,3); - } - if ( v > 0 ) - tab_hline(t, TAL_1, 0, n_cols - 1, (v * lines_per_variable) + 1); - } + /* Now for the Variances NOT Equal case */ - tab_submit (t); + /* Std. Error */ + tab_float (t, 4, + (v * lines_per_variable) + i + 1 + cmd.sbc_contrast, + TAB_RIGHT, sec_vneq, + 8,3); -} + T = contrast_value / sec_vneq; + tab_float (t, 5, + (v * lines_per_variable) + i + 1 + cmd.sbc_contrast, + TAB_RIGHT, T, + 8,3); -/* ONEWAY ANOVA Calculations */ -static void postcalc ( struct cmd_oneway *cmd UNUSED ); + df = df_numerator / df_denominator; -static void precalc ( struct cmd_oneway *cmd UNUSED ); + tab_float (t, 6, + (v * lines_per_variable) + i + 1 + cmd.sbc_contrast, + TAB_RIGHT, df, + 8,3); -int compare_group_id (const struct group_statistics *a, - const struct group_statistics *b, int width); + /* The Significance */ -unsigned int hash_group_id(const struct group_statistics *v, int width); + tab_float (t, 7, (v * lines_per_variable) + i + 1 + cmd.sbc_contrast, + TAB_RIGHT, 2 * gsl_cdf_tdist_Q(T,df), + 8,3); -void free_group_id(struct group_statistics *v, void *aux UNUSED); + } + if ( v > 0 ) + tab_hline(t, TAL_1, 0, n_cols - 1, (v * lines_per_variable) + 1); + } + tab_submit (t); -int -compare_group_id (const struct group_statistics *a, - const struct group_statistics *b, int width) -{ - return compare_values(&a->id, &b->id, width); } -unsigned int -hash_group_id(const struct group_statistics *v, int width) -{ - return hash_value ( &v->id, width); -} -void -free_group_id(struct group_statistics *v, void *aux UNUSED) -{ - free(v); -} +/* ONEWAY ANOVA Calculations */ + +static void postcalc ( struct cmd_oneway *cmd UNUSED ); + +static void precalc ( struct cmd_oneway *cmd UNUSED ); + /* Pre calculations */ @@ -812,17 +857,18 @@ precalc ( struct cmd_oneway *cmd UNUSED ) for(i=0; i< n_vars ; ++i) { - struct group_statistics *totals = &vars[i]->p.ww.ugs; + struct group_proc *gp = group_proc_get (vars[i]); + struct group_statistics *totals = &gp->ugs; /* Create a hash for each of the dependent variables. The hash contains a group_statistics structure, and is keyed by value of the independent variable */ - vars[i]->p.ww.group_hash = + gp->group_hash = hsh_create(4, - (hsh_compare_func *) compare_group_id, - (hsh_hash_func *) hash_group_id, - (hsh_free_func *) free_group_id, + (hsh_compare_func *) compare_group, + (hsh_hash_func *) hash_group, + (hsh_free_func *) free_group, (void *) indep_var->width ); @@ -837,12 +883,11 @@ precalc ( struct cmd_oneway *cmd UNUSED ) static void -calculate(const struct casefile *cf, void *cmd_) +run_oneway(const struct casefile *cf, void *cmd_) { struct casereader *r; struct ccase c; - struct cmd_oneway *cmd = (struct cmd_oneway *) cmd_; global_group_hash = hsh_create(4, @@ -850,7 +895,6 @@ calculate(const struct casefile *cf, void *cmd_) (hsh_hash_func *) hash_value, 0, (void *) indep_var->width ); - precalc(cmd); for(r = casefile_get_reader (cf); @@ -863,17 +907,38 @@ calculate(const struct casefile *cf, void *cmd_) dict_get_case_weight(default_dict,&c,&bad_weight_warn); const union value *indep_val = case_data (&c, indep_var->fv); + + /* Deal with missing values */ + if ( value_is_missing(indep_val,indep_var) ) + continue; + + /* Skip the entire case if /MISSING=LISTWISE is set */ + if ( cmd->miss == ONEWAY_LISTWISE ) + { + for(i = 0; i < n_vars ; ++i) + { + const struct variable *v = vars[i]; + const union value *val = case_data (&c, v->fv); + + if (value_is_missing(val,v) ) + break; + } + if ( i != n_vars ) + continue; + + } + hsh_insert ( global_group_hash, (void *) indep_val ); - for ( i = 0 ; i < n_vars ; ++i ) { const struct variable *v = vars[i]; const union value *val = case_data (&c, v->fv); - struct hsh_table *group_hash = vars[i]->p.ww.group_hash; + struct group_proc *gp = group_proc_get (vars[i]); + struct hsh_table *group_hash = gp->group_hash; struct group_statistics *gs; @@ -897,7 +962,7 @@ calculate(const struct casefile *cf, void *cmd_) if (! value_is_missing(val,v) ) { - struct group_statistics *totals = &vars[i]->p.ww.ugs; + struct group_statistics *totals = &gp->ugs; totals->n+=weight; totals->sum+=weight * val->f; @@ -920,7 +985,7 @@ calculate(const struct casefile *cf, void *cmd_) gs->maximum = val->f * weight; } - vars[i]->p.ww.n_groups = hsh_count ( group_hash ); + gp->n_groups = hsh_count ( group_hash ); } } @@ -928,8 +993,18 @@ calculate(const struct casefile *cf, void *cmd_) postcalc(cmd); + + if ( stat_tables & STAT_HOMO ) + levene(cf, indep_var, n_vars, vars, + (cmd->miss == ONEWAY_LISTWISE) ? LEV_LISTWISE : LEV_ANALYSIS , + value_is_missing); + ostensible_number_of_groups = hsh_count (global_group_hash); + + output_oneway(); + + } @@ -942,8 +1017,9 @@ postcalc ( struct cmd_oneway *cmd UNUSED ) for(i = 0; i < n_vars ; ++i) { - struct hsh_table *group_hash = vars[i]->p.ww.group_hash; - struct group_statistics *totals = &vars[i]->p.ww.ugs; + struct group_proc *gp = group_proc_get (vars[i]); + struct hsh_table *group_hash = gp->group_hash; + struct group_statistics *totals = &gp->ugs; struct hsh_iterator g; struct group_statistics *gs; @@ -977,8 +1053,5 @@ postcalc ( struct cmd_oneway *cmd UNUSED ) totals->se_mean = totals->std_dev / sqrt(totals->n); - - - } }