#include "group_proc.h"
#include "group.h"
#include "levene.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* (headers) */
/* (specification)
static struct variable *indep_var;
/* Number of dependent variables */
-static int n_vars;
+static size_t n_vars;
/* The dependent variables */
static struct variable **vars;
/* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func *value_is_missing;
static void run_oneway(const struct casefile *cf, void *_mode);
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == ONEWAY_INCLUDE )
- value_is_missing = is_system_missing;
+ value_is_missing = mv_is_value_system_missing;
else
- value_is_missing = is_missing;
+ value_is_missing = mv_is_value_missing;
/* What statistics were requested */
if ( cmd.sbc_statistics )
void
output_oneway(void)
{
-
- int i;
+ size_t i;
short *bad_contrast ;
- bad_contrast = xmalloc ( sizeof (short) * cmd.sbc_contrast );
+ bad_contrast = xnmalloc (cmd.sbc_contrast, sizeof *bad_contrast);
/* Check the sanity of the given contrast values */
for (i = 0 ; i < cmd.sbc_contrast ; ++i )
static void
show_anova_table(void)
{
- int i;
+ size_t i;
int n_cols =7;
- int n_rows = n_vars * 3 + 1;
+ size_t n_rows = n_vars * 3 + 1;
struct tab_table *t;
static void
show_descriptives(void)
{
- int v;
+ size_t v;
int n_cols =10;
struct tab_table *t;
int row;
const char *s = var_to_string(vars[v]);
- struct group_statistics **gs_array = hsh_sort(gp->group_hash);
+ struct group_statistics *const *gs_array = hsh_sort(gp->group_hash);
int count = 0;
tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s);
static void
show_homogeneity(void)
{
- int v;
+ size_t v;
int n_cols = 5;
- int n_rows = n_vars + 1;
+ size_t n_rows = n_vars + 1;
struct tab_table *t;
int n_rows = 2 + cmd.sbc_contrast;
union value *group_value;
int count = 0 ;
- void **group_values ;
+ void *const *group_values ;
struct tab_table *t;
static void
show_contrast_tests(short *bad_contrast)
{
- int v;
+ size_t v;
int n_cols = 8;
- int n_rows = 1 + n_vars * 2 * cmd.sbc_contrast;
+ size_t n_rows = 1 + n_vars * 2 * cmd.sbc_contrast;
struct tab_table *t;
struct group_proc *grp_data = group_proc_get (vars[v]);
struct hsh_table *group_hash = grp_data->group_hash;
- void **group_stat_array;
+ void *const *group_stat_array;
double T;
double std_error_contrast ;
static void
precalc ( struct cmd_oneway *cmd UNUSED )
{
- int i=0;
+ size_t i=0;
for(i=0; i< n_vars ; ++i)
{
casereader_read (r, &c) ;
case_destroy (&c))
{
- int i;
+ size_t i;
const double weight =
dict_get_case_weight(default_dict,&c,&bad_weight_warn);
const union value *indep_val = case_data (&c, indep_var->fv);
/* Deal with missing values */
- if ( value_is_missing(indep_val,indep_var) )
+ if ( value_is_missing(&indep_var->miss, indep_val) )
continue;
/* Skip the entire case if /MISSING=LISTWISE is set */
const struct variable *v = vars[i];
const union value *val = case_data (&c, v->fv);
- if (value_is_missing(val,v) )
+ if (value_is_missing(&v->miss, val) )
break;
}
if ( i != n_vars )
if ( ! gs )
{
- gs = (struct group_statistics *)
- xmalloc (sizeof(struct group_statistics));
-
+ gs = xmalloc (sizeof *gs);
gs->id = *indep_val;
gs->sum=0;
gs->n=0;
hsh_insert ( group_hash, (void *) gs );
}
- if (! value_is_missing(val,v) )
+ if (! value_is_missing(&v->miss, val) )
{
struct group_statistics *totals = &gp->ugs;
void
postcalc ( struct cmd_oneway *cmd UNUSED )
{
- int i=0;
+ size_t i=0;
for(i = 0; i < n_vars ; ++i)