X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Foneway.q;h=69ab5a48e15d2bf664af388681d03f589fc9594c;hb=9f650fc3d2946c216e6cd3c7922a8a63d0f97117;hp=0b75608a761b482286eb3df470d233477e576da6;hpb=42489b63e0b4bec2e20c2f55c9791234f7b41764;p=pspp-builds.git diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q index 0b75608a..69ab5a48 100644 --- a/src/language/stats/oneway.q +++ b/src/language/stats/oneway.q @@ -1,7 +1,6 @@ /* PSPP - One way ANOVA. -*-c-*- 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 @@ -31,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include #include #include +#include #include #include #include @@ -65,8 +65,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA /* (declarations) */ /* (functions) */ - - static bool bad_weight_warn = true; @@ -88,15 +86,12 @@ static struct hsh_table *global_group_hash ; /* The number of distinct values of the independent variable, when all missing values are disregarded */ -static int ostensible_number_of_groups=-1; - - -/* Function to use for testing for missing values */ -static is_missing_func *value_is_missing; +static int ostensible_number_of_groups = -1; static bool run_oneway(const struct ccase *first, - const struct casefile *cf, void *_mode); + const struct casefile *cf, + void *_mode, const struct dataset *); /* Routines to show the output tables */ @@ -116,20 +111,14 @@ void output_oneway(void); int -cmd_oneway(void) +cmd_oneway (struct lexer *lexer, struct dataset *ds) { int i; bool ok; - if ( !parse_oneway(&cmd, NULL) ) + if ( !parse_oneway (lexer, ds, &cmd, NULL) ) return CMD_FAILURE; - /* If /MISSING=INCLUDE is set, then user missing values are ignored */ - if (cmd.incl == ONEWAY_INCLUDE ) - value_is_missing = mv_is_value_system_missing; - else - value_is_missing = mv_is_value_missing; - /* What statistics were requested */ if ( cmd.sbc_statistics ) { @@ -149,7 +138,7 @@ cmd_oneway(void) } } - ok = multipass_procedure_with_splits (current_dataset, run_oneway, &cmd); + ok = multipass_procedure_with_splits (ds, run_oneway, &cmd); free (vars); free_oneway (&cmd); @@ -223,17 +212,19 @@ output_oneway(void) /* Parser for the variables sub command */ static int -oneway_custom_variables(struct cmd_oneway *cmd UNUSED, void *aux UNUSED) +oneway_custom_variables (struct lexer *lexer, + struct dataset *ds, struct cmd_oneway *cmd UNUSED, + void *aux UNUSED) { + struct dictionary *dict = dataset_dict (ds); - lex_match('='); + lex_match (lexer, '='); - if ((token != T_ID || dict_lookup_var (dataset_dict (current_dataset), tokid) == NULL) - && token != T_ALL) + if ((lex_token (lexer) != T_ID || dict_lookup_var (dict, lex_tokid (lexer)) == NULL) + && lex_token (lexer) != T_ALL) return 2; - - if (!parse_variables (dataset_dict (current_dataset), &vars, &n_vars, + if (!parse_variables (lexer, dict, &vars, &n_vars, PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH) ) { @@ -243,19 +234,17 @@ oneway_custom_variables(struct cmd_oneway *cmd UNUSED, void *aux UNUSED) assert(n_vars); - if ( ! lex_match(T_BY)) + if ( ! lex_match (lexer, T_BY)) return 2; - - indep_var = parse_variable(); + indep_var = parse_variable (lexer, dict); if ( !indep_var ) { - msg(SE,_("`%s' is not a variable name"),tokid); + msg(SE,_("`%s' is not a variable name"),lex_tokid (lexer)); return 0; } - return 1; } @@ -362,10 +351,9 @@ show_anova_table(void) tab_title (t, _("ANOVA")); tab_submit (t); - - } + /* Show the descriptives table */ static void show_descriptives(void) @@ -446,7 +434,8 @@ show_descriptives(void) gs = gs_array[count]; tab_text (t, 1, row + count, - TAB_LEFT | TAT_TITLE ,value_to_string(&gs->id,indep_var)); + TAB_LEFT | TAT_TITLE, var_get_value_name(indep_var, + &gs->id)); /* Now fill in the numbers ... */ @@ -572,14 +561,12 @@ show_homogeneity(void) } tab_submit (t); - - } /* Show the contrast coefficients table */ static void -show_contrast_coeffs(short *bad_contrast) +show_contrast_coeffs (short *bad_contrast) { int n_cols = 2 + ostensible_number_of_groups; int n_rows = 2 + cmd.sbc_contrast; @@ -634,7 +621,7 @@ show_contrast_coeffs(short *bad_contrast) group_value = group_values[count]; tab_text (t, count + 2, 1, TAB_CENTER | TAT_TITLE, - value_to_string(group_value, indep_var)); + var_get_value_name (indep_var, group_value)); for (i = 0 ; i < cmd.sbc_contrast ; ++i ) { @@ -880,7 +867,7 @@ precalc ( struct cmd_oneway *cmd UNUSED ) (hsh_compare_func *) compare_group, (hsh_hash_func *) hash_group, (hsh_free_func *) free_group, - (void *) indep_var->width ); + (void *) var_get_width (indep_var) ); totals->sum=0; @@ -894,53 +881,44 @@ precalc ( struct cmd_oneway *cmd UNUSED ) static bool -run_oneway(const struct ccase *first, const struct casefile *cf, void *cmd_) +run_oneway(const struct ccase *first, const struct casefile *cf, + void *cmd_, const struct dataset *ds) { struct casereader *r; struct ccase c; + struct casefilter *filter = NULL; struct cmd_oneway *cmd = (struct cmd_oneway *) cmd_; - output_split_file_values (first); + output_split_file_values (ds, first); global_group_hash = hsh_create(4, (hsh_compare_func *) compare_values, (hsh_hash_func *) hash_value, 0, - (void *) indep_var->width ); + (void *) var_get_width (indep_var) ); + precalc(cmd); - for(r = casefile_get_reader (cf); + filter = casefilter_create ( (cmd->incl != ONEWAY_INCLUDE + ? MV_ANY : MV_SYSTEM), + vars, n_vars ); + + for(r = casefile_get_reader (cf, filter); casereader_read (r, &c) ; case_destroy (&c)) { size_t i; const double weight = - dict_get_case_weight (dataset_dict (current_dataset), &c, &bad_weight_warn); + dict_get_case_weight (dataset_dict (ds), &c, &bad_weight_warn); - const union value *indep_val = case_data (&c, indep_var->fv); + const union value *indep_val; - /* Deal with missing values */ - if ( value_is_missing(&indep_var->miss, indep_val) ) + if ( casefilter_variable_missing (filter, &c, 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(&v->miss, val) ) - break; - } - if ( i != n_vars ) - continue; - - } - + indep_val = case_data (&c, indep_var); hsh_insert ( global_group_hash, (void *) indep_val ); @@ -948,7 +926,7 @@ run_oneway(const struct ccase *first, const struct casefile *cf, void *cmd_) { const struct variable *v = vars[i]; - const union value *val = case_data (&c, v->fv); + const union value *val = case_data (&c, v); struct group_proc *gp = group_proc_get (vars[i]); struct hsh_table *group_hash = gp->group_hash; @@ -970,8 +948,8 @@ run_oneway(const struct ccase *first, const struct casefile *cf, void *cmd_) hsh_insert ( group_hash, (void *) gs ); } - - if (! value_is_missing(&v->miss, val) ) + + if (! casefilter_variable_missing (filter, &c, v)) { struct group_statistics *totals = &gp->ugs; @@ -1000,15 +978,17 @@ run_oneway(const struct ccase *first, const struct casefile *cf, void *cmd_) } } + casereader_destroy (r); 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); + levene (dataset_dict (ds), cf, indep_var, n_vars, vars, + filter); + + casefilter_destroy (filter); ostensible_number_of_groups = hsh_count (global_group_hash);