projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change type of variables whose addresses are passed to dict_get_vars()
[pspp-builds.git]
/
src
/
t-test.q
diff --git
a/src/t-test.q
b/src/t-test.q
index 07bcdd07f0db51c351df8b88c3e15e7bf9aa4bce..89f1741f33e5240d1f259e38e9bda4220840a248 100644
(file)
--- a/
src/t-test.q
+++ b/
src/t-test.q
@@
-67,7
+67,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;
@@
-330,9
+330,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;
@@
-1418,7
+1418,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;
}
@@
-1429,7
+1429,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;
}
@@
-1444,7
+1444,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;
@@
-1517,7
+1517,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;
}
@@
-1532,7
+1532,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]);
}
@@
-1611,8
+1611,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;
}
@@
-1627,7
+1627,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;
@@
-1744,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;
}
@@
-1756,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;
}
@@
-1779,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;