projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix description of "count" in Auxiliary Variable Parameter Record.
[pspp]
/
src
/
t-test.q
diff --git
a/src/t-test.q
b/src/t-test.q
index b33c5c2824185ab985a96877bad50e96a358a116..5fdb802d633be7246b49c2f639c130e63905cf41 100644
(file)
--- a/
src/t-test.q
+++ b/
src/t-test.q
@@
-26,23
+26,28
@@
#include <stdlib.h>
#include <math.h>
#include "alloc.h"
#include <stdlib.h>
#include <math.h>
#include "alloc.h"
-#include "str.h"
#include "case.h"
#include "case.h"
+#include "casefile.h"
#include "command.h"
#include "dictionary.h"
#include "command.h"
#include "dictionary.h"
-#include "lexer.h"
#include "error.h"
#include "error.h"
+#include "group_proc.h"
+#include "hash.h"
+#include "levene.h"
+#include "lexer.h"
#include "magic.h"
#include "misc.h"
#include "magic.h"
#include "misc.h"
-#include "
tab
.h"
+#include "
size_max
.h"
#include "som.h"
#include "som.h"
+#include "str.h"
+#include "tab.h"
#include "value-labels.h"
#include "var.h"
#include "vfm.h"
#include "value-labels.h"
#include "var.h"
#include "vfm.h"
-#include "hash.h"
-#include "g
roup_proc
.h"
-#
include "casefile.h"
-#include "levene.h"
+
+#include "g
ettext
.h"
+#
define _(msgid) gettext (msgid)
+
/* (headers) */
/* (specification)
/* (headers) */
/* (specification)
@@
-63,7
+68,7
@@
/* Function to use for testing for missing values */
/* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func
*
value_is_missing;
/* Variable for the GROUPS subcommand, if given. */
static struct variable *indep_var;
/* Variable for the GROUPS subcommand, if given. */
static struct variable *indep_var;
@@
-305,8
+310,8
@@
cmd_t_test(void)
assert(cmd.n_variables == 0);
cmd.n_variables = hsh_count(hash);
assert(cmd.n_variables == 0);
cmd.n_variables = hsh_count(hash);
- cmd.v_variables = x
realloc(cmd.v
_variables,
-
sizeof(struct variable) * cmd.n
_variables);
+ cmd.v_variables = x
nrealloc (cmd.v_variables, cmd.n
_variables,
+
sizeof *cmd.v
_variables);
/* Iterate through the hash */
for (i=0,v = (struct variable *) hsh_first(hash,&hi);
v != 0;
/* Iterate through the hash */
for (i=0,v = (struct variable *) hsh_first(hash,&hi);
v != 0;
@@
-326,9
+331,9
@@
cmd_t_test(void)
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == TTS_INCLUDE )
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == TTS_INCLUDE )
- value_is_missing =
is
_system_missing;
+ value_is_missing =
mv_is_value
_system_missing;
else
else
- value_is_missing =
is
_missing;
+ value_is_missing =
mv_is_value
_missing;
bad_weight_warn = 1;
bad_weight_warn = 1;
@@
-360,14
+365,6
@@
tts_custom_groups (struct cmd_t_test *cmd UNUSED)
lex_match('=');
lex_match('=');
- if (token != T_ALL &&
- (token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
- )
- {
- msg(SE,_("`%s' is not a variable name"),tokid);
- return 0;
- }
-
indep_var = parse_variable ();
if (!indep_var)
{
indep_var = parse_variable ();
if (!indep_var)
{
@@
-444,22
+441,15
@@
static int
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
{
struct variable **vars;
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
{
struct variable **vars;
-
in
t n_vars;
-
in
t n_pairs_local;
+
size_
t n_vars;
+
size_
t n_pairs_local;
-
int n_before_WITH
;
-
int n_after_WITH = -1
;
+
size_t n_before_WITH
;
+
size_t n_after_WITH = SIZE_MAX
;
int paired ; /* Was the PAIRED keyword given ? */
lex_match('=');
int paired ; /* Was the PAIRED keyword given ? */
lex_match('=');
- if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
- && token != T_ALL)
- {
- msg(SE,_("`%s' is not a variable name"),tokid);
- return 0;
- }
-
n_vars=0;
if (!parse_variables (default_dict, &vars, &n_vars,
PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH))
n_vars=0;
if (!parse_variables (default_dict, &vars, &n_vars,
PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH))
@@
-469,7
+459,7
@@
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
}
assert (n_vars);
}
assert (n_vars);
- n_before_WITH
=
0;
+ n_before_WITH
=
0;
if (lex_match (T_WITH))
{
n_before_WITH = n_vars;
if (lex_match (T_WITH))
{
n_before_WITH = n_vars;
@@
-497,11
+487,11
@@
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
n_before_WITH, n_after_WITH );
return 0;
}
n_before_WITH, n_after_WITH );
return 0;
}
- n_pairs_local
=
n_before_WITH;
+ n_pairs_local
=
n_before_WITH;
}
else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
{
}
else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
{
- n_pairs_local
=
n_before_WITH * n_after_WITH ;
+ n_pairs_local
=
n_before_WITH * n_after_WITH ;
}
else /* Neither WITH nor PAIRED keyword given */
{
}
else /* Neither WITH nor PAIRED keyword given */
{
@@
-514,29
+504,29
@@
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
}
/* how many ways can you pick 2 from n_vars ? */
}
/* how many ways can you pick 2 from n_vars ? */
- n_pairs_local = n_vars * (n_vars -
1 ) /2
;
+ n_pairs_local = n_vars * (n_vars -
1) / 2
;
}
/* Allocate storage for the pairs */
}
/* Allocate storage for the pairs */
- pairs = x
realloc(pairs, sizeof(struct pair) * (n_pairs + n_pairs_local)
);
+ pairs = x
nrealloc (pairs, n_pairs + n_pairs_local, sizeof *pairs
);
/* Populate the pairs with the appropriate variables */
if ( paired )
{
int i;
/* Populate the pairs with the appropriate variables */
if ( paired )
{
int i;
- assert(n_pairs_local == n_vars
/
2);
- for (i = 0; i < n_pairs_local
; ++i)
+ assert(n_pairs_local == n_vars
/
2);
+ for (i = 0; i < n_pairs_local; ++i)
{
{
- pairs[i].v[n_pairs
+0
] = vars[i];
- pairs[i].v[n_pairs
+1] = vars[i+
n_pairs_local];
+ pairs[i].v[n_pairs] = vars[i];
+ pairs[i].v[n_pairs
+ 1] = vars[i +
n_pairs_local];
}
}
else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
{
int i,j;
}
}
else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
{
int i,j;
-
int p=
n_pairs;
+
size_t p =
n_pairs;
for(i=0 ; i < n_before_WITH ; ++i )
{
for(i=0 ; i < n_before_WITH ; ++i )
{
@@
-550,8
+540,8
@@
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
}
else /* Neither WITH nor PAIRED given */
{
}
else /* Neither WITH nor PAIRED given */
{
-
in
t i,j;
-
in
t p=n_pairs;
+
size_
t i,j;
+
size_
t p=n_pairs;
for(i=0 ; i < n_vars ; ++i )
{
for(i=0 ; i < n_vars ; ++i )
{
@@
-900,7
+890,7
@@
ssbox_one_sample_populate(struct ssbox *ssb, struct cmd_t_test *cmd)
/* Implementation of the Test Results box struct */
/* Implementation of the Test Results box struct */
-void trbox_base_init(struct trbox *self,
in
t n_vars, int cols);
+void trbox_base_init(struct trbox *self,
size_
t n_vars, int cols);
void trbox_base_finalize(struct trbox *trb);
void trbox_independent_samples_init(struct trbox *trb,
void trbox_base_finalize(struct trbox *trb);
void trbox_independent_samples_init(struct trbox *trb,
@@
-1328,9
+1318,9
@@
trbox_one_sample_populate(struct trbox *trb, struct cmd_t_test *cmd)
/* Base initializer for the generalized trbox */
void
/* Base initializer for the generalized trbox */
void
-trbox_base_init(struct trbox *self,
in
t data_rows, int cols)
+trbox_base_init(struct trbox *self,
size_
t data_rows, int cols)
{
{
- const
in
t rows = 3 + data_rows;
+ const
size_
t rows = 3 + data_rows;
self->finalize = trbox_base_finalize;
self->t = tab_create (cols, rows, 0);
self->finalize = trbox_base_finalize;
self->t = tab_create (cols, rows, 0);
@@
-1429,7
+1419,7
@@
common_calc (const struct ccase *c, void *_cmd)
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- if (value_is_missing(
val,v
) )
+ if (value_is_missing(
&v->miss, val
) )
{
return 0;
}
{
return 0;
}
@@
-1440,7
+1430,7
@@
common_calc (const struct ccase *c, void *_cmd)
if ( cmd->sbc_groups )
{
const union value *gv = case_data (c, indep_var->fv);
if ( cmd->sbc_groups )
{
const union value *gv = case_data (c, indep_var->fv);
- if ( value_is_missing(
gv,indep_var
) )
+ if ( value_is_missing(
&indep_var->miss, gv
) )
{
return 0;
}
{
return 0;
}
@@
-1455,7
+1445,7
@@
common_calc (const struct ccase *c, void *_cmd)
gs= &group_proc_get (cmd->v_variables[i])->ugs;
gs= &group_proc_get (cmd->v_variables[i])->ugs;
- if (! value_is_missing(
val,v
) )
+ if (! value_is_missing(
&v->miss, val
) )
{
gs->n+=weight;
gs->sum+=weight * val->f;
{
gs->n+=weight;
gs->sum+=weight * val->f;
@@
-1528,7
+1518,7
@@
one_sample_calc (const struct ccase *c, void *cmd_)
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- if (value_is_missing(
val,v
) )
+ if (value_is_missing(
&v->miss, val
) )
{
return 0;
}
{
return 0;
}
@@
-1543,7
+1533,7
@@
one_sample_calc (const struct ccase *c, void *cmd_)
gs= &group_proc_get (cmd->v_variables[i])->ugs;
gs= &group_proc_get (cmd->v_variables[i])->ugs;
- if ( ! value_is_missing(
val,v
))
+ if ( ! value_is_missing(
&v->miss, val
))
gs->sum_diff += weight * (val->f - cmd->n_testval[0]);
}
gs->sum_diff += weight * (val->f - cmd->n_testval[0]);
}
@@
-1622,8
+1612,8
@@
paired_calc (const struct ccase *c, void *cmd_)
const union value *val0 = case_data (c, v0->fv);
const union value *val1 = case_data (c, v1->fv);
const union value *val0 = case_data (c, v0->fv);
const union value *val1 = case_data (c, v1->fv);
- if ( value_is_missing(
val0,v
0) ||
- value_is_missing(
val1,v
1) )
+ if ( value_is_missing(
&v0->miss, val
0) ||
+ value_is_missing(
&v1->miss, val
1) )
{
return 0;
}
{
return 0;
}
@@
-1638,7
+1628,8
@@
paired_calc (const struct ccase *c, void *cmd_)
const union value *val0 = case_data (c, v0->fv);
const union value *val1 = case_data (c, v1->fv);
const union value *val0 = case_data (c, v0->fv);
const union value *val1 = case_data (c, v1->fv);
- if ( ( !value_is_missing(val0,v0) && !value_is_missing(val1,v1) ) )
+ if ( ( !value_is_missing(&v0->miss, val0)
+ && !value_is_missing(&v1->miss, val1) ) )
{
pairs[i].n += weight;
pairs[i].sum[0] += weight * val0->f;
{
pairs[i].n += weight;
pairs[i].sum[0] += weight * val0->f;
@@
-1720,8
+1711,7
@@
group_precalc (struct cmd_t_test *cmd )
for (j=0 ; j < 2 ; ++j)
{
for (j=0 ; j < 2 ; ++j)
{
- struct group_statistics *gs = (struct group_statistics *)
- xmalloc (sizeof(struct group_statistics));
+ struct group_statistics *gs = xmalloc (sizeof *gs);
gs->sum = 0;
gs->n = 0;
gs->sum = 0;
gs->n = 0;
@@
-1755,7
+1745,7
@@
group_calc (const struct ccase *c, struct cmd_t_test *cmd)
const double weight = dict_get_case_weight(default_dict,c,&bad_weight_warn);
const double weight = dict_get_case_weight(default_dict,c,&bad_weight_warn);
- if ( value_is_missing(
gv,indep_var
) )
+ if ( value_is_missing(
&indep_var->miss, gv
) )
{
return 0;
}
{
return 0;
}
@@
-1767,7
+1757,7
@@
group_calc (const struct ccase *c, struct cmd_t_test *cmd)
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- if (value_is_missing(
val,v
) )
+ if (value_is_missing(
&v->miss, val
) )
{
return 0;
}
{
return 0;
}
@@
-1790,7
+1780,7
@@
group_calc (const struct ccase *c, struct cmd_t_test *cmd)
if ( ! gs )
return 0;
if ( ! gs )
return 0;
- if ( !value_is_missing(
val,var
) )
+ if ( !value_is_missing(
&var->miss, val
) )
{
gs->n+=weight;
gs->sum+=weight * val->f;
{
gs->n+=weight;
gs->sum+=weight * val->f;