projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove devind output driver.
[pspp]
/
src
/
examine.q
diff --git
a/src/examine.q
b/src/examine.q
index b54f574b5c36631f79ed2b7e98f0fd5f3daca5f3..fc0c0c9a94f8752aee67aeeded7b8b68553daa15 100644
(file)
--- a/
src/examine.q
+++ b/
src/examine.q
@@
-77,7
+77,7
@@
static struct cmd_examine cmd;
static struct variable **dependent_vars;
static struct variable **dependent_vars;
-static
in
t n_dependent_vars;
+static
size_
t n_dependent_vars;
struct factor
struct factor
@@
-169,7
+169,7
@@
const char *factor_to_string_concise(const struct factor *fctr,
/* 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;
/* PERCENTILES */
/* PERCENTILES */
@@
-193,9
+193,9
@@
cmd_examine(void)
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == XMN_INCLUDE )
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == XMN_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;
if ( cmd.st_n == SYSMIS )
cmd.st_n = 5;
if ( cmd.st_n == SYSMIS )
cmd.st_n = 5;
@@
-328,7
+328,7
@@
output_examine(void)
if ( cmd.sbc_plot)
{
if ( cmd.sbc_plot)
{
-
in
t v;
+
size_
t v;
struct factor_statistics **fs = fctr->fs ;
struct factor_statistics **fs = fctr->fs ;
@@
-394,7
+394,7
@@
list_to_ptile_hash(const subc_list_double *l)
for ( i = 0 ; i < subc_list_double_count(l) ; ++i )
{
for ( i = 0 ; i < subc_list_double_count(l) ; ++i )
{
- struct percentile *p = xmalloc (sizeof
(struct percentile)
);
+ struct percentile *p = xmalloc (sizeof
*p
);
p->p = subc_list_double_at(l,i);
p->v = SYSMIS;
p->p = subc_list_double_at(l,i);
p->v = SYSMIS;
@@
-511,7
+511,7
@@
xmn_custom_variables(struct cmd_examine *cmd )
assert(n_dependent_vars);
assert(n_dependent_vars);
- totals = x
malloc( sizeof(struct metrics) * n_dependent_var
s);
+ totals = x
nmalloc (n_dependent_vars, sizeof *total
s);
if ( lex_match(T_BY))
{
if ( lex_match(T_BY))
{
@@
-534,7
+534,7
@@
static int
examine_parse_independent_vars(struct cmd_examine *cmd)
{
int success;
examine_parse_independent_vars(struct cmd_examine *cmd)
{
int success;
- struct factor *sf = xmalloc
(sizeof(struct factor)
);
+ struct factor *sf = xmalloc
(sizeof *sf
);
if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
&& token != T_ALL)
if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
&& token != T_ALL)
@@
-611,7
+611,7
@@
static int bad_weight_warn = 1;
void
factor_calc(struct ccase *c, int case_no, double weight, int case_missing)
{
void
factor_calc(struct ccase *c, int case_no, double weight, int case_missing)
{
-
in
t v;
+
size_
t v;
struct factor *fctr = factors;
while ( fctr)
struct factor *fctr = factors;
while ( fctr)
@@
-650,7
+650,7
@@
factor_calc(struct ccase *c, int case_no, double weight, int case_missing)
const struct variable *var = dependent_vars[v];
const union value *val = case_data (c, var->fv);
const struct variable *var = dependent_vars[v];
const union value *val = case_data (c, var->fv);
- if ( value_is_missing
(val,var
) || case_missing )
+ if ( value_is_missing
(&var->miss, val
) || case_missing )
val = 0;
metrics_calc( &(*foo)->m[v], val, weight, case_no);
val = 0;
metrics_calc( &(*foo)->m[v], val, weight, case_no);
@@
-712,7
+712,7
@@
run_examine(const struct casefile *cf, void *cmd_ )
const struct variable *var = dependent_vars[v];
const union value *val = case_data (&c, var->fv);
const struct variable *var = dependent_vars[v];
const union value *val = case_data (&c, var->fv);
- if ( value_is_missing(
val,var
))
+ if ( value_is_missing(
&var->miss, val
))
case_missing = 1;
}
case_missing = 1;
}
@@
-723,7
+723,7
@@
run_examine(const struct casefile *cf, void *cmd_ )
const struct variable *var = dependent_vars[v];
const union value *val = case_data (&c, var->fv);
const struct variable *var = dependent_vars[v];
const union value *val = case_data (&c, var->fv);
- if ( value_is_missing(
val,var
) || case_missing )
+ if ( value_is_missing(
&var->miss, val
) || case_missing )
val = 0;
metrics_calc(&totals[v], val, weight, case_no);
val = 0;
metrics_calc(&totals[v], val, weight, case_no);
@@
-812,7
+812,7
@@
run_examine(const struct casefile *cf, void *cmd_ )
hsh_probe(fctr->fstats, (void *) &key );
if ( !*ffs ) {
hsh_probe(fctr->fstats, (void *) &key );
if ( !*ffs ) {
-
in
t i;
+
size_
t i;
(*ffs) = create_factor_statistics (n_dependent_vars,
&key[0], &key[1]);
for ( i = 0 ; i < n_dependent_vars ; ++i )
(*ffs) = create_factor_statistics (n_dependent_vars,
&key[0], &key[1]);
for ( i = 0 ; i < n_dependent_vars ; ++i )
@@
-834,7
+834,7
@@
run_examine(const struct casefile *cf, void *cmd_ )
if ( totals )
{
if ( totals )
{
-
in
t i;
+
size_
t i;
for ( i = 0 ; i < n_dependent_vars ; ++i )
{
metrics_destroy(&totals[i]);
for ( i = 0 ; i < n_dependent_vars ; ++i )
{
metrics_destroy(&totals[i]);
@@
-1858,7
+1858,7
@@
np_plot(const struct metrics *m, const char *factorname)
{
/* We have to cache the detrended data, beacause we need to
find its limits before we can plot it */
{
/* We have to cache the detrended data, beacause we need to
find its limits before we can plot it */
- double *d_data = x
malloc (m->n_data * sizeof(double)
);
+ double *d_data = x
nmalloc (m->n_data, sizeof *d_data
);
double d_max = -DBL_MAX;
double d_min = DBL_MAX;
for ( i = 0 ; i < m->n_data; ++i )
double d_max = -DBL_MAX;
double d_min = DBL_MAX;
for ( i = 0 ; i < m->n_data; ++i )