X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmeans.c;h=9a07a14bb6f3dcffac0d82bfc5c98c36df95a200;hb=fd308174a81b1702426720536acd3aa4a3021801;hp=c859fb9e695e440af0d60cc0c221ce538f1cd39e;hpb=dae2296e30e86491c61d824a0bce43abfe376ca6;p=pspp diff --git a/src/language/stats/means.c b/src/language/stats/means.c index c859fb9e69..9a07a14bb6 100644 --- a/src/language/stats/means.c +++ b/src/language/stats/means.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc. 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 @@ -384,7 +384,7 @@ first_update (void *stat, double w UNUSED, double x) double *f = stat; if (*f == SYSMIS) - *f = x; + *f = x; } static double @@ -502,11 +502,12 @@ parse_means_table_syntax (struct lexer *lexer, const struct means *cmd, struct m table->ii = 0; table->n_layers = 0; table->layers = NULL; + table->interactions = NULL; /* Dependent variable (s) */ - if (!parse_variables_const (lexer, cmd->dict, - &table->dep_vars, &table->n_dep_vars, - PV_NO_DUPLICATE | PV_NUMERIC)) + if (!parse_variables_const_pool (lexer, cmd->pool, cmd->dict, + &table->dep_vars, &table->n_dep_vars, + PV_NO_DUPLICATE | PV_NUMERIC)) return false; /* Factor variable (s) */ @@ -516,11 +517,11 @@ parse_means_table_syntax (struct lexer *lexer, const struct means *cmd, struct m { table->n_layers++; table->layers = - xrealloc (table->layers, - sizeof (*table->layers) * table->n_layers); + pool_realloc (cmd->pool, table->layers, + sizeof (*table->layers) * table->n_layers); - if (!parse_variables_const - (lexer, cmd->dict, + if (!parse_variables_const_pool + (lexer, cmd->pool, cmd->dict, &table->layers[table->n_layers - 1].factor_vars, &table->layers[table->n_layers - 1].n_factor_vars, PV_NO_DUPLICATE)) @@ -537,8 +538,8 @@ parse_means_table_syntax (struct lexer *lexer, const struct means *cmd, struct m table->n_layers++; table->layers = - xrealloc (table->layers, - sizeof (*table->layers) * table->n_layers); + pool_realloc (cmd->pool, table->layers, + sizeof (*table->layers) * table->n_layers); table->layers[table->n_layers - 1].factor_vars = NULL; table->layers[table->n_layers - 1].n_factor_vars = 0; @@ -574,6 +575,8 @@ cmd_means (struct lexer *lexer, struct dataset *ds) struct means means; bool more_tables = true; + means.pool = pool_create (); + means.exclude = MV_ANY; means.dep_exclude = MV_ANY; means.listwise_exclude = false; @@ -583,7 +586,7 @@ cmd_means (struct lexer *lexer, struct dataset *ds) means.dict = dataset_dict (ds); means.n_cells = 3; - means.cells = xcalloc (means.n_cells, sizeof (*means.cells)); + means.cells = pool_calloc (means.pool, means.n_cells, sizeof (*means.cells)); /* The first three items (MEAN, COUNT, STDDEV) are the default */ @@ -603,7 +606,7 @@ cmd_means (struct lexer *lexer, struct dataset *ds) while (more_tables) { means.n_tables ++; - means.table = xrealloc (means.table, means.n_tables * sizeof (*means.table)); + means.table = pool_realloc (means.pool, means.table, means.n_tables * sizeof (*means.table)); if (! parse_means_table_syntax (lexer, &means, &means.table[means.n_tables - 1])) @@ -631,10 +634,10 @@ cmd_means (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "MISSING")) { /* - If no MISSING subcommand is specified, each combination of - a dependent variable and categorical variables is handled - separately. - */ + If no MISSING subcommand is specified, each combination of + a dependent variable and categorical variables is handled + separately. + */ lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "INCLUDE")) { @@ -659,17 +662,17 @@ cmd_means (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "DEPENDENT")) /* - Use the command "/MISSING=DEPENDENT" to - include user-missing values for the categorical variables, - while excluding them for the dependent variables. + Use the command "/MISSING=DEPENDENT" to + include user-missing values for the categorical variables, + while excluding them for the dependent variables. - Cases are dropped only when user-missing values - appear in dependent variables. User-missing - values for categorical variables are treated according to - their face value. + Cases are dropped only when user-missing values + appear in dependent variables. User-missing + values for categorical variables are treated according to + their face value. - Cases are ALWAYS dropped when System Missing values appear - in the categorical variables. + Cases are ALWAYS dropped when System Missing values appear + in the categorical variables. */ { means.dep_exclude = MV_ANY; @@ -695,8 +698,8 @@ cmd_means (struct lexer *lexer, struct dataset *ds) { int x; means.cells = - xrealloc (means.cells, - (means.n_cells += n_C) * sizeof (*means.cells)); + pool_realloc (means.pool, means.cells, + (means.n_cells += n_C) * sizeof (*means.cells)); for (x = 0; x < n_C; ++x) means.cells[means.n_cells - (n_C - 1 - x) - 1] = x; @@ -708,8 +711,8 @@ cmd_means (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "DEFAULT")) { means.cells = - xrealloc (means.cells, - (means.n_cells += 3) * sizeof (*means.cells)); + pool_realloc (means.pool, means.cells, + (means.n_cells += 3) * sizeof (*means.cells)); means.cells[means.n_cells - 2 - 1] = MEANS_MEAN; means.cells[means.n_cells - 1 - 1] = MEANS_N; @@ -722,8 +725,8 @@ cmd_means (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, cell_spec[k].keyword)) { means.cells = - xrealloc (means.cells, - ++means.n_cells * sizeof (*means.cells)); + pool_realloc (means.pool, means.cells, + ++means.n_cells * sizeof (*means.cells)); means.cells[means.n_cells - 1] = k; break; @@ -744,32 +747,31 @@ cmd_means (struct lexer *lexer, struct dataset *ds) } } - means.pool = pool_create (); for (t = 0; t < means.n_tables; ++t) - { - struct mtable *table = &means.table[t]; + { + struct mtable *table = &means.table[t]; - table->interactions = - xcalloc (table->n_layers, sizeof (*table->interactions)); + table->interactions = + pool_calloc (means.pool, table->n_layers, sizeof (*table->interactions)); - table->summary = - xcalloc (table->n_dep_vars * table->n_layers, sizeof (*table->summary)); + table->summary = + pool_calloc (means.pool, table->n_dep_vars * table->n_layers, sizeof (*table->summary)); - for (l = 0; l < table->n_layers; ++l) - { - int v; - const struct layer *lyr = &table->layers[l]; - const int n_vars = lyr->n_factor_vars; - table->interactions[l] = interaction_create (NULL); - for (v = 0 ; v < n_vars ; ++v) - { - interaction_add_variable (table->interactions[l], - lyr->factor_vars[v]); - } - } - } + for (l = 0; l < table->n_layers; ++l) + { + int v; + const struct layer *lyr = &table->layers[l]; + const int n_vars = lyr->n_factor_vars; + table->interactions[l] = interaction_create (NULL); + for (v = 0; v < n_vars ; ++v) + { + interaction_add_variable (table->interactions[l], + lyr->factor_vars[v]); + } + } + } { struct casegrouper *grouper; @@ -785,11 +787,34 @@ cmd_means (struct lexer *lexer, struct dataset *ds) ok = proc_commit (ds) && ok; } + for (t = 0; t < means.n_tables; ++t) + { + int l; + struct mtable *table = &means.table[t]; + if (table->interactions) + for (l = 0; l < table->n_layers; ++l) + { + interaction_destroy (table->interactions[l]); + } + } + pool_destroy (means.pool); return CMD_SUCCESS; -error: + error: + for (t = 0; t < means.n_tables; ++t) + { + int l; + struct mtable *table = &means.table[t]; + if (table->interactions) + for (l = 0; l < table->n_layers; ++l) + { + interaction_destroy (table->interactions[l]); + } + } + + pool_destroy (means.pool); return CMD_FAILURE; } @@ -824,22 +849,38 @@ struct per_cat_data bool warn; }; + +static void +destroy_n (const void *aux1 UNUSED, void *aux2, void *user_data) +{ + struct mtable *table = aux2; + int v; + struct per_cat_data *per_cat_data = user_data; + struct per_var_data *pvd = per_cat_data->pvd; + + for (v = 0; v < table->n_dep_vars; ++v) + { + struct per_var_data *pp = &pvd[v]; + moments1_destroy (pp->mom); + } +} + static void * create_n (const void *aux1, void *aux2) { int i, v; const struct means *means = aux1; struct mtable *table = aux2; - struct per_cat_data *per_cat_data = xmalloc (sizeof *per_cat_data); + struct per_cat_data *per_cat_data = pool_malloc (means->pool, sizeof *per_cat_data); - struct per_var_data *pvd = xcalloc (table->n_dep_vars, sizeof *pvd); + struct per_var_data *pvd = pool_calloc (means->pool, table->n_dep_vars, sizeof *pvd); for (v = 0; v < table->n_dep_vars; ++v) { enum moment maxmom = MOMENT_KURTOSIS; struct per_var_data *pp = &pvd[v]; - pp->cell_stats = xcalloc (means->n_cells, sizeof *pp->cell_stats); + pp->cell_stats = pool_calloc (means->pool, means->n_cells, sizeof *pp->cell_stats); for (i = 0; i < means->n_cells; ++i) @@ -935,19 +976,20 @@ run_means (struct means *cmd, struct casereader *input, struct payload payload; payload.create = create_n; payload.update = update_n; - payload.destroy = calculate_n; + payload.calculate = calculate_n; + payload.destroy = destroy_n; for (t = 0; t < cmd->n_tables; ++t) - { - struct mtable *table = &cmd->table[t]; - table->cats - = categoricals_create (table->interactions, - table->n_layers, wv, cmd->exclude); + { + struct mtable *table = &cmd->table[t]; + table->cats + = categoricals_create (table->interactions, + table->n_layers, wv, cmd->dep_exclude, cmd->exclude); - categoricals_set_payload (table->cats, &payload, cmd, table); - } + categoricals_set_payload (table->cats, &payload, cmd, table); + } - for (reader = casereader_clone (input); + for (reader = input; (c = casereader_read (reader)) != NULL; case_unref (c)) { for (t = 0; t < cmd->n_tables; ++t) @@ -1132,7 +1174,7 @@ output_report (const struct means *cmd, int iact_idx, tab_box (t, TAL_2, TAL_2, -1, TAL_1, 0, 0, nc - 1, nr - 1); tab_hline (t, TAL_2, 0, nc - 1, heading_rows); - tab_vline (t, TAL_2, iact->n_vars, 0, nr - 1); + tab_vline (t, TAL_2, heading_columns, 0, nr - 1); for (i = 0; i < iact->n_vars; ++i) { @@ -1159,7 +1201,7 @@ output_report (const struct means *cmd, int iact_idx, tab_text (t, 0, heading_rows + dv * n_cats, TAB_RIGHT | TAT_TITLE, - var_get_name (table->dep_vars[dv]) + var_to_string (table->dep_vars[dv]) ); if ( dv > 0)