/* PSPP - a program for statistical analysis.
- Copyright (C) 2011 Free Software Foundation, Inc.
+ Copyright (C) 2011, 2015 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
int
cmd_t_test (struct lexer *lexer, struct dataset *ds)
{
- bool ok;
- const struct dictionary *dict = dataset_dict (ds);
- struct tt tt;
- int mode_count = 0;
+ bool ok = false;
/* Variables pertaining to the paired mode */
const struct variable **v1 = NULL;
- size_t n_v1;
+ size_t n_v1 = 0;
const struct variable **v2 = NULL;
- size_t n_v2;
-
- size_t n_pairs;
- vp *pairs = NULL;
+ size_t n_v2 = 0;
+ size_t n_pairs = 0;
+ vp *pairs = NULL;
/* One sample mode */
- double testval;
+ double testval = SYSMIS;
/* Independent samples mode */
const struct variable *gvar;
union value gval0;
union value gval1;
- bool cut;
+ int gval_width = -1;
+ bool cut = false;
- tt.wv = dict_get_weight (dict);
- tt.dict = dict;
- tt.confidence = 0.95;
- tt.exclude = MV_ANY;
- tt.missing_type = MISS_ANALYSIS;
- tt.n_vars = 0;
- tt.vars = NULL;
- tt.mode = MODE_undef;
+ const struct dictionary *dict = dataset_dict (ds);
+ struct tt tt = {
+ .wv = dict_get_weight (dict),
+ .dict = dict,
+ .confidence = 0.95,
+ .exclude = MV_ANY,
+ .missing_type = MISS_ANALYSIS,
+ .n_vars = 0,
+ .vars = NULL,
+ };
lex_match (lexer, T_EQUALS);
- for (; lex_token (lexer) != T_ENDCMD; )
+ int mode_count = 0;
+ while (lex_token (lexer) != T_ENDCMD)
{
lex_match (lexer, T_SLASH);
if (lex_match_id (lexer, "TESTVAL"))
- {
- mode_count++;
- tt.mode = MODE_SINGLE;
- lex_match (lexer, T_EQUALS);
- lex_force_num (lexer);
- testval = lex_number (lexer);
- lex_get (lexer);
- }
+ {
+ mode_count++;
+ tt.mode = MODE_SINGLE;
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_num (lexer))
+ goto exit;
+ testval = lex_number (lexer);
+ lex_get (lexer);
+ }
else if (lex_match_id (lexer, "GROUPS"))
- {
- mode_count++;
- cut = false;
- tt.mode = MODE_INDEP;
- lex_match (lexer, T_EQUALS);
-
- if (NULL == (gvar = parse_variable (lexer, dict)))
- goto parse_failed;
-
- if (lex_match (lexer, T_LPAREN))
- {
-
- value_init (&gval0, var_get_width (gvar));
- parse_value (lexer, &gval0, gvar);
- cut = true;
- if (lex_match (lexer, T_COMMA))
- {
- value_init (&gval1, var_get_width (gvar));
- parse_value (lexer, &gval1, gvar);
- cut = false;
- }
-
- lex_force_match (lexer, T_RPAREN);
- }
- else
- {
- value_init (&gval0, 0);
- value_init (&gval1, 0);
- gval0.f = 1.0;
- gval1.f = 2.0;
- cut = false;
- }
-
- if ( cut == true && var_is_alpha (gvar))
- {
- msg (SE, _("When applying GROUPS to a string variable, two "
- "values must be specified."));
- goto parse_failed;
- }
- }
+ {
+ mode_count++;
+ cut = false;
+ tt.mode = MODE_INDEP;
+ lex_match (lexer, T_EQUALS);
+
+ int groups_start = lex_ofs (lexer);
+ gvar = parse_variable (lexer, dict);
+ if (!gvar)
+ goto exit;
+
+ gval_width = var_get_width (gvar);
+ value_init (&gval0, gval_width);
+ value_init (&gval1, gval_width);
+
+ int n;
+ if (lex_match (lexer, T_LPAREN))
+ {
+ if (!parse_value (lexer, &gval0, gvar))
+ goto exit;
+ if (lex_token (lexer) != T_RPAREN)
+ {
+ lex_match (lexer, T_COMMA);
+ if (!parse_value (lexer, &gval1, gvar))
+ goto exit;
+ cut = false;
+ n = 2;
+ }
+ else
+ {
+ cut = true;
+ n = 1;
+ }
+
+ if (!lex_force_match (lexer, T_RPAREN))
+ goto exit;
+ }
+ else
+ {
+ gval0.f = 1.0;
+ gval1.f = 2.0;
+ cut = false;
+ n = 0;
+ }
+ int groups_end = lex_ofs (lexer) - 1;
+
+ if (n != 2 && var_is_alpha (gvar))
+ {
+ lex_ofs_error (lexer, groups_start, groups_end,
+ _("When applying %s to a string variable, two "
+ "values must be specified."), "GROUPS");
+ goto exit;
+ }
+ }
else if (lex_match_id (lexer, "PAIRS"))
- {
- bool with = false;
- bool paired = false;
-
- if (tt.n_vars > 0)
- {
- msg (SE, _("VARIABLES subcommand may not be used with PAIRS."));
- goto parse_failed;
- }
-
- mode_count++;
- tt.mode = MODE_PAIRED;
- lex_match (lexer, T_EQUALS);
-
- if (!parse_variables_const (lexer, dict,
- &v1, &n_v1,
- PV_NO_DUPLICATE | PV_NUMERIC))
- goto parse_failed;
-
- if ( lex_match (lexer, T_WITH))
- {
- with = true;
- if (!parse_variables_const (lexer, dict,
- &v2, &n_v2,
- PV_NO_DUPLICATE | PV_NUMERIC))
- goto parse_failed;
-
- if (lex_match (lexer, T_LPAREN)
- && lex_match_id (lexer, "PAIRED")
- && lex_match (lexer, T_RPAREN))
- {
- paired = true;
- if (n_v1 != n_v2)
- {
- msg (SE, _("PAIRED was specified but the number of variables "
- "preceding WITH (%zu) did not match the number "
- "following (%zu)."),
- n_v1, n_v2);
- goto parse_failed;
- }
- }
- }
- {
- int i;
-
- if ( !with )
- n_pairs = (n_v1 * (n_v1 - 1)) / 2.0;
- else if ( paired )
- n_pairs = n_v1;
- else
- n_pairs = n_v1 * n_v2;
-
- pairs = xcalloc (sizeof *pairs, n_pairs);
-
-
- if ( with)
- {
- int x = 0;
- if (paired)
- {
- for (i = 0 ; i < n_v1; ++i)
- {
- vp *pair = &pairs[i];
- (*pair)[0] = v1[i];
- (*pair)[1] = v2[i];
- }
- }
- else
- {
- for (i = 0 ; i < n_v1; ++i)
- {
- int j;
- for (j = 0 ; j < n_v2; ++j)
- {
- vp *pair = &pairs[x++];
- (*pair)[0] = v1[i];
- (*pair)[1] = v2[j];
- }
- }
- }
- }
- else
- {
- int x = 0;
- for (i = 0 ; i < n_v1; ++i)
- {
- int j;
-
- for (j = i + 1 ; j < n_v1; ++j)
- {
- vp *pair = &pairs[x++];
- (*pair)[0] = v1[i];
- (*pair)[1] = v1[j];
- }
- }
- }
-
- }
- }
+ {
+ bool with = false;
+ bool paired = false;
+
+ if (tt.n_vars > 0)
+ {
+ lex_next_error (lexer, -1, -1,
+ _("%s subcommand may not be used with %s."),
+ "VARIABLES", "PAIRS");
+ goto exit;
+ }
+
+ mode_count++;
+ tt.mode = MODE_PAIRED;
+ lex_match (lexer, T_EQUALS);
+
+ int vars_start = lex_ofs (lexer);
+ if (!parse_variables_const (lexer, dict,
+ &v1, &n_v1,
+ PV_NO_DUPLICATE | PV_NUMERIC))
+ goto exit;
+
+ if (lex_match (lexer, T_WITH))
+ {
+ with = true;
+ if (!parse_variables_const (lexer, dict,
+ &v2, &n_v2,
+ PV_NO_DUPLICATE | PV_NUMERIC))
+ goto exit;
+ int vars_end = lex_ofs (lexer) - 1;
+
+ if (lex_match_phrase (lexer, "(PAIRED)"))
+ {
+ paired = true;
+ if (n_v1 != n_v2)
+ {
+ lex_ofs_error (lexer, vars_start, vars_end,
+ _("PAIRED was specified, but the number "
+ "of variables preceding WITH (%zu) "
+ "does not match the number following "
+ "(%zu)."),
+ n_v1, n_v2);
+ goto exit;
+ }
+ }
+ }
+
+ n_pairs = (paired ? n_v1
+ : with ? n_v1 * n_v2
+ : (n_v1 * (n_v1 - 1)) / 2.0);
+ pairs = xcalloc (n_pairs, sizeof *pairs);
+
+ if (paired)
+ {
+ for (size_t i = 0; i < n_v1; ++i)
+ {
+ vp *pair = &pairs[i];
+ (*pair)[0] = v1[i];
+ (*pair)[1] = v2[i];
+ }
+ }
+ else if (with)
+ {
+ int x = 0;
+ for (size_t i = 0; i < n_v1; ++i)
+ for (size_t j = 0; j < n_v2; ++j)
+ {
+ vp *pair = &pairs[x++];
+ (*pair)[0] = v1[i];
+ (*pair)[1] = v2[j];
+ }
+ }
+ else
+ {
+ int x = 0;
+ for (size_t i = 0; i < n_v1; ++i)
+ for (size_t j = i + 1; j < n_v1; ++j)
+ {
+ vp *pair = &pairs[x++];
+ (*pair)[0] = v1[i];
+ (*pair)[1] = v1[j];
+ }
+ }
+ }
else if (lex_match_id (lexer, "VARIABLES"))
- {
- if ( tt.mode == MODE_PAIRED)
- {
- msg (SE, _("VARIABLES subcommand may not be used with PAIRS."));
- goto parse_failed;
- }
-
- lex_match (lexer, T_EQUALS);
-
- if (!parse_variables_const (lexer, dict,
- &tt.vars,
- &tt.n_vars,
- PV_NO_DUPLICATE | PV_NUMERIC))
- goto parse_failed;
- }
- else if ( lex_match_id (lexer, "MISSING"))
- {
+ {
+ if (mode_count && tt.mode == MODE_PAIRED)
+ {
+ lex_next_error (lexer, -1, -1,
+ _("%s subcommand may not be used with %s."),
+ "VARIABLES", "PAIRS");
+ goto exit;
+ }
+
+ lex_match (lexer, T_EQUALS);
+
+ if (!parse_variables_const (lexer, dict,
+ &tt.vars,
+ &tt.n_vars,
+ PV_NO_DUPLICATE | PV_NUMERIC))
+ goto exit;
+ }
+ else if (lex_match_id (lexer, "MISSING"))
+ {
lex_match (lexer, T_EQUALS);
while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH)
{
- if (lex_match_id (lexer, "INCLUDE"))
- {
- tt.exclude = MV_SYSTEM;
- }
- else if (lex_match_id (lexer, "EXCLUDE"))
- {
- tt.exclude = MV_ANY;
- }
- else if (lex_match_id (lexer, "LISTWISE"))
- {
- tt.missing_type = MISS_LISTWISE;
- }
- else if (lex_match_id (lexer, "ANALYSIS"))
- {
- tt.missing_type = MISS_ANALYSIS;
- }
- else
- {
- lex_error (lexer, NULL);
- goto parse_failed;
- }
- lex_match (lexer, T_COMMA);
- }
- }
+ if (lex_match_id (lexer, "INCLUDE"))
+ tt.exclude = MV_SYSTEM;
+ else if (lex_match_id (lexer, "EXCLUDE"))
+ tt.exclude = MV_ANY;
+ else if (lex_match_id (lexer, "LISTWISE"))
+ tt.missing_type = MISS_LISTWISE;
+ else if (lex_match_id (lexer, "ANALYSIS"))
+ tt.missing_type = MISS_ANALYSIS;
+ else
+ {
+ lex_error_expecting (lexer, "INCLUDE", "EXCLUDE",
+ "LISTWISE", "ANALYSIS");
+ goto exit;
+ }
+ lex_match (lexer, T_COMMA);
+ }
+ }
else if (lex_match_id (lexer, "CRITERIA"))
- {
+ {
lex_match (lexer, T_EQUALS);
- if ( lex_force_match_id (lexer, "CIN"))
- if ( lex_force_match (lexer, T_LPAREN))
- {
- lex_force_num (lexer);
- tt.confidence = lex_number (lexer);
- lex_get (lexer);
- lex_force_match (lexer, T_RPAREN);
- }
- }
- else
- {
- lex_error (lexer, NULL);
- goto parse_failed;
- }
+ if (!lex_match_id (lexer, "CIN") && !lex_match_id (lexer, "CI"))
+ {
+ lex_error_expecting (lexer, "CIN", "CI");
+ goto exit;
+ }
+ if (!lex_force_match (lexer, T_LPAREN))
+ goto exit;
+ if (!lex_force_num (lexer))
+ goto exit;
+ tt.confidence = lex_number (lexer);
+ lex_get (lexer);
+ if (!lex_force_match (lexer, T_RPAREN))
+ goto exit;
+ }
+ else
+ {
+ lex_error_expecting (lexer, "TESTVAL", "GROUPS", "PAIRS",
+ "VARIABLES", "MISSING", "CRITERIA");
+ goto exit;
+ }
}
- if ( mode_count != 1)
+ if (mode_count != 1)
{
msg (SE, _("Exactly one of TESTVAL, GROUPS and PAIRS subcommands "
- "must be specified."));
- goto parse_failed;
+ "must be specified."));
+ goto exit;
}
if (tt.n_vars == 0 && tt.mode != MODE_PAIRED)
{
- msg (SE, _("One or more VARIABLES must be specified."));
- goto parse_failed;
+ lex_sbc_missing (lexer, "VARIABLES");
+ goto exit;
}
-
-
- /* Deal with splits etc */
- {
- struct casereader *group;
- struct casegrouper *grouper = casegrouper_create_splits (proc_open (ds), dict);
-
- while (casegrouper_get_next_group (grouper, &group))
+ struct casereader *group;
+ struct casegrouper *grouper = casegrouper_create_splits (proc_open (ds), dict);
+ while (casegrouper_get_next_group (grouper, &group))
+ switch (tt.mode)
{
- if ( tt.mode == MODE_SINGLE)
- {
- if ( tt.missing_type == MISS_LISTWISE )
- group = casereader_create_filter_missing (group,
- tt.vars, tt.n_vars,
- tt.exclude,
- NULL, NULL);
- one_sample_run (&tt, testval, group);
- }
- else if ( tt.mode == MODE_PAIRED)
- {
- if ( tt.missing_type == MISS_LISTWISE )
- {
- group = casereader_create_filter_missing (group,
- v1, n_v1,
- tt.exclude,
- NULL, NULL);
- group = casereader_create_filter_missing (group,
- v2, n_v2,
- tt.exclude,
- NULL, NULL);
- }
-
- paired_run (&tt, n_pairs, pairs, group);
- }
- else /* tt.mode == MODE_INDEP */
- {
- if ( tt.missing_type == MISS_LISTWISE )
- {
- group = casereader_create_filter_missing (group,
- tt.vars, tt.n_vars,
- tt.exclude,
- NULL, NULL);
-
- group = casereader_create_filter_missing (group,
- &gvar, 1,
- tt.exclude,
- NULL, NULL);
-
- }
-
- indep_run (&tt, gvar, cut, &gval0, &gval1, group);
- }
+ case MODE_SINGLE:
+ if (tt.missing_type == MISS_LISTWISE)
+ group = casereader_create_filter_missing (group, tt.vars, tt.n_vars,
+ tt.exclude, NULL, NULL);
+ one_sample_run (&tt, testval, group);
+ break;
+
+ case MODE_PAIRED:
+ if (tt.missing_type == MISS_LISTWISE)
+ {
+ group = casereader_create_filter_missing (group, v1, n_v1,
+ tt.exclude, NULL, NULL);
+ group = casereader_create_filter_missing (group, v2, n_v2,
+ tt.exclude, NULL, NULL);
+ }
+ paired_run (&tt, n_pairs, pairs, group);
+ break;
+
+ case MODE_INDEP:
+ if (tt.missing_type == MISS_LISTWISE)
+ {
+ group = casereader_create_filter_missing (group, tt.vars, tt.n_vars,
+ tt.exclude, NULL, NULL);
+ group = casereader_create_filter_missing (group, &gvar, 1,
+ tt.exclude, NULL, NULL);
+ }
+ indep_run (&tt, gvar, cut, &gval0, &gval1, group);
+ break;
}
- ok = casegrouper_destroy (grouper);
- ok = proc_commit (ds) && ok;
- }
+ ok = casegrouper_destroy (grouper);
+ ok = proc_commit (ds) && ok;
+exit:
+ if (gval_width != -1)
+ {
+ value_destroy (&gval0, gval_width);
+ value_destroy (&gval1, gval_width);
+ }
free (pairs);
free (v1);
free (v2);
-
free (tt.vars);
return ok ? CMD_SUCCESS : CMD_FAILURE;
-
- parse_failed:
- return CMD_FAILURE;
}
projects / pspp / blobdiff