/* PSPP - One way ANOVA. -*-c-*-
-Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-Author: John Darrington 2004
+Copyright (C) 1997-9, 2000, 2007 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
#include <data/procedure.h>
#include <data/value-labels.h>
#include <data/variable.h>
+#include <data/casefilter.h>
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
/* (declarations) */
/* (functions) */
-
-
static bool bad_weight_warn = true;
static int ostensible_number_of_groups = -1;
-/* Function to use for testing for missing values */
-static is_missing_func *value_is_missing;
-
-
static bool run_oneway(const struct ccase *first,
- const struct casefile *cf, void *_mode, const struct dataset *);
+ const struct casefile *cf,
+ void *_mode, const struct dataset *);
/* Routines to show the output tables */
int
-cmd_oneway (struct dataset *ds)
+cmd_oneway (struct lexer *lexer, struct dataset *ds)
{
int i;
bool ok;
- if ( !parse_oneway (ds, &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 )
{
sum += subc_list_double_at(&cmd.dl_contrast[i],j);
if ( sum != 0.0 )
- msg(SW,_("Coefficients for contrast %d do not total zero"),i + 1);
+ msg(SW,_("Coefficients for contrast %d do not total zero"),
+ (int) i + 1);
}
if ( stat_tables & STAT_DESC )
/* Parser for the variables sub command */
static int
-oneway_custom_variables(struct dataset *ds, 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 (dict, 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 (dict, &vars, &n_vars,
+ if (!parse_variables (lexer, dict, &vars, &n_vars,
PV_DUPLICATE
| PV_NUMERIC | PV_NO_SCRATCH) )
{
assert(n_vars);
- if ( ! lex_match(T_BY))
+ if ( ! lex_match (lexer, T_BY))
return 2;
- indep_var = parse_variable (dict);
+ 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;
}
tab_title (t, _("ANOVA"));
tab_submit (t);
-
-
}
+
/* Show the descriptives table */
static void
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 ... */
}
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;
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 )
{
(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;
}
}
+static void
+free_value (void *value_, const void *aux UNUSED)
+{
+ union value *value = value_;
+ free (value);
+}
static bool
-run_oneway(const struct ccase *first, const struct casefile *cf, void *cmd_, const struct dataset *ds)
+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_;
global_group_hash = hsh_create(4,
(hsh_compare_func *) compare_values,
(hsh_hash_func *) hash_value,
- 0,
- (void *) indep_var->width );
+ free_value,
+ (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))
{
const double weight =
dict_get_case_weight (dataset_dict (ds), &c, &bad_weight_warn);
-
- const union value *indep_val = case_data (&c, indep_var->fv);
- /* Deal with missing values */
- if ( value_is_missing(&indep_var->miss, indep_val) )
+ const union value *indep_val;
+ void **p;
+
+ 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);
+ p = hsh_probe (global_group_hash, indep_val);
+ if (*p == NULL)
+ *p = value_dup (indep_val, var_get_width (indep_var));
hsh_insert ( global_group_hash, (void *) indep_val );
{
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;
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;
}
}
+
casereader_destroy (r);
postcalc(cmd);
if ( stat_tables & STAT_HOMO )
levene (dataset_dict (ds), cf, indep_var, n_vars, vars,
- (cmd->miss == ONEWAY_LISTWISE) ? LEV_LISTWISE : LEV_ANALYSIS ,
- value_is_missing);
+ filter);
+
+ casefilter_destroy (filter);
ostensible_number_of_groups = hsh_count (global_group_hash);
projects / pspp-builds.git / blobdiff