X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foneway.q;h=f413cda15410af5bc0bcd269cfb64c03fbd676c4;hb=b9799cdd10b30ea96d9178b7a0d48504d052228c;hp=84d50c1623ce156a784afc839d4aca52cf3bb194;hpb=20fd432b34d65999f06fabfa8e9c3f5efbac41bd;p=pspp-builds.git diff --git a/src/oneway.q b/src/oneway.q index 84d50c16..f413cda1 100644 --- a/src/oneway.q +++ b/src/oneway.q @@ -15,8 +15,8 @@ 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. */ +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #include #include @@ -43,11 +43,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "group_proc.h" #include "group.h" #include "levene.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* (headers) */ /* (specification) "ONEWAY" (oneway_): - *variables=custom; + *^variables=custom; +missing=miss:!analysis/listwise, incl:include/!exclude; contrast= double list; @@ -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 ) @@ -140,6 +144,8 @@ cmd_oneway(void) multipass_procedure_with_splits (run_oneway, &cmd); + free (vars); + free_oneway (&cmd); return CMD_SUCCESS; } @@ -148,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 ) @@ -252,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; @@ -288,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; @@ -299,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")); @@ -360,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; @@ -371,8 +374,6 @@ show_descriptives(void) int n_rows = 2 ; - - for ( v = 0 ; v < n_vars ; ++v ) n_rows += group_proc_get (vars[v])->n_groups + 1; @@ -420,25 +421,22 @@ show_descriptives(void) struct group_proc *gp = group_proc_get (vars[v]); - struct hsh_iterator g; struct group_statistics *gs; struct group_statistics *totals = &gp->ugs; - int count = 0 ; const char *s = var_to_string(vars[v]); - struct hsh_table *group_hash = 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); 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) { + gs = gs_array[count]; + tab_text (t, 1, row + count, TAB_LEFT | TAT_TITLE ,value_to_string(&gs->id,indep_var)); @@ -469,7 +467,6 @@ show_descriptives(void) 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, @@ -513,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; @@ -578,14 +575,12 @@ show_contrast_coeffs(short *bad_contrast) { 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 *const *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); @@ -597,7 +592,6 @@ show_contrast_coeffs(short *bad_contrast) 0, 0, n_cols - 1, n_rows - 1); - tab_box (t, -1,-1, TAL_0, TAL_0, @@ -610,50 +604,44 @@ show_contrast_coeffs(short *bad_contrast) 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")); - 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; + group_value = group_values[count]; tab_text (t, count + 2, 1, TAB_CENTER | TAT_TITLE, - value_to_string(group_value,indep_var)); + 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); 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) + subc_list_double_at(&cmd.dl_contrast[i], count) ); } - - count++ ; } - + tab_submit (t); - } @@ -661,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; @@ -713,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 hsh_iterator g; - struct group_statistics *gs; + + void *const *group_stat_array; double T; double std_error_contrast ; @@ -722,8 +710,8 @@ show_contrast_tests(short *bad_contrast) double sec_vneq=0.0; - /* Note: The calculation of the degrees of freedom in the variances - not equal case is painfull!! + /* 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} { @@ -735,8 +723,6 @@ show_contrast_tests(short *bad_contrast) double df_denominator = 0.0; double df_numerator = 0.0; - - if ( i == 0 ) { tab_text (t, 1, (v * lines_per_variable) + i + 1, @@ -759,15 +745,13 @@ show_contrast_tests(short *bad_contrast) if ( bad_contrast[i]) continue; - /* 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)) + 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); + struct group_statistics *gs = group_stat_array[ci]; - const double coef = subc_list_double_at(&cmd.dl_contrast[i],ci); const double winv = (gs->std_dev * gs->std_dev) / gs->n; contrast_value += coef * gs->mean; @@ -778,7 +762,6 @@ show_contrast_tests(short *bad_contrast) df_numerator += (coef * coef) * winv; df_denominator += pow2((coef * coef) * winv) / (gs->n - 1); - } sec_vneq = sqrt(sec_vneq); @@ -873,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) { @@ -921,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); @@ -929,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 */ @@ -940,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 ) @@ -966,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; @@ -980,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; @@ -1032,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)