return *f;
}
-enum
+enum
{
MEANS_MEAN = 0,
MEANS_N,
return false;
/* Factor variable (s) */
- while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH)
+ while (lex_match (lexer, T_BY))
{
- if (lex_match (lexer, T_BY))
- {
- table->n_layers++;
- table->layers =
- pool_realloc (cmd->pool, table->layers,
- sizeof (*table->layers) * table->n_layers);
-
- 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))
- return false;
-
- }
+ table->n_layers++;
+ table->layers =
+ pool_realloc (cmd->pool, table->layers,
+ sizeof (*table->layers) * table->n_layers);
+
+ 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))
+ return false;
}
/* There is always at least one layer.
However the final layer is the total, and not
- normally considered by the user as a
+ normally considered by the user as a
layer.
*/
table->n_layers++;
- table->layers =
- pool_realloc (cmd->pool, table->layers,
+ table->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;
/* Optional TABLES = */
if (lex_match_id (lexer, "TABLES"))
{
- lex_force_match (lexer, T_EQUALS);
+ if (! lex_force_match (lexer, T_EQUALS))
+ goto error;
}
means.n_tables ++;
means.table = pool_realloc (means.pool, means.table, means.n_tables * sizeof (*means.table));
- if (! parse_means_table_syntax (lexer, &means,
+ if (! parse_means_table_syntax (lexer, &means,
&means.table[means.n_tables - 1]))
{
goto error;
if (lex_is_variable (lexer, means.dict, 1) )
{
more_tables = true;
- lex_force_match (lexer, T_SLASH);
+ lex_match (lexer, T_SLASH);
}
}
}
else if (lex_match_id (lexer, "DEPENDENT"))
/*
Use the command "/MISSING=DEPENDENT" to
- include user-missing values for the categorical variables,
+ include user-missing values for the categorical variables,
while excluding them for the dependent variables.
Cases are dropped only when user-missing values
values for categorical variables are treated according to
their face value.
- Cases are ALWAYS dropped when System Missing values appear
+ Cases are ALWAYS dropped when System Missing values appear
in the categorical variables.
*/
{
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;
means.cells[means.n_cells - 0 - 1] = MEANS_STDDEV;
means.cells =
pool_realloc (means.pool, means.cells,
++means.n_cells * sizeof (*means.cells));
-
+
means.cells[means.n_cells - 1] = k;
break;
}
for (l = 0; l < table->n_layers; ++l)
{
interaction_destroy (table->interactions[l]);
- }
+ }
}
-
+
pool_destroy (means.pool);
return CMD_FAILURE;
}
};
-static void
+static void
destroy_n (const void *aux1 UNUSED, void *aux2, void *user_data)
{
struct mtable *table = aux2;
struct per_var_data *pp = &pvd[v];
pp->cell_stats = pool_calloc (means->pool, means->n_cells, sizeof *pp->cell_stats);
-
+
for (i = 0; i < means->n_cells; ++i)
{
payload.update = update_n;
payload.calculate = calculate_n;
payload.destroy = destroy_n;
-
+
for (t = 0; t < cmd->n_tables; ++t)
{
struct mtable *table = &cmd->table[t];
TAB_LEFT | TAT_TITLE, ds_cstr (&str));
- n_total = table->summary[row].missing +
+ n_total = table->summary[row].missing +
table->summary[row].non_missing;
tab_double (t, 1, row + heading_rows,
- 0, table->summary[row].non_missing, &F_8_0);
+ 0, table->summary[row].non_missing, NULL, RC_INTEGER);
tab_text_format (t, 2, row + heading_rows,
- 0, _("%g%%"),
+ 0, _("%g%%"),
table->summary[row].non_missing / (double) n_total * 100.0);
tab_double (t, 3, row + heading_rows,
- 0, table->summary[row].missing, &F_8_0);
+ 0, table->summary[row].missing, NULL, RC_INTEGER);
tab_text_format (t, 4, row + heading_rows,
- 0, _("%g%%"),
+ 0, _("%g%%"),
table->summary[row].missing / (double) n_total * 100.0);
tab_double (t, 5, row + heading_rows,
- 0, table->summary[row].missing +
- table->summary[row].non_missing, &F_8_0);
+ 0, table->summary[row].missing +
+ table->summary[row].non_missing, NULL, RC_INTEGER);
tab_text_format (t, 6, row + heading_rows,
- 0, _("%g%%"),
+ 0, _("%g%%"),
n_total / (double) n_total * 100.0);
tab_double (t, heading_columns + i,
heading_rows + grp + dv * n_cats,
- 0, result, 0);
+ 0, result, NULL, RC_OTHER);
}
}
}