projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
language
/
stats
/
npar-summary.c
diff --git
a/src/language/stats/npar-summary.c
b/src/language/stats/npar-summary.c
index db40dfc29bd7ebd98501b1728f76d71444b9cd1b..3ad3a5bb1554194cca7160be6b9b87fd4200e7dd 100644
(file)
--- a/
src/language/stats/npar-summary.c
+++ b/
src/language/stats/npar-summary.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 2009
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 published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-47,23
+47,23
@@
npar_summary_calc_descriptives (struct descriptives *desc,
double maximum = -DBL_MAX;
double var;
struct moments1 *moments = moments1_create (MOMENT_VARIANCE);
double maximum = -DBL_MAX;
double var;
struct moments1 *moments = moments1_create (MOMENT_VARIANCE);
- struct ccase c;
+ struct ccase
*
c;
const struct variable *v = *vv++;
struct casereader *pass;
pass = casereader_clone (input);
pass = casereader_create_filter_missing (pass,
&v, 1,
const struct variable *v = *vv++;
struct casereader *pass;
pass = casereader_clone (input);
pass = casereader_create_filter_missing (pass,
&v, 1,
- filter, NULL);
+ filter, NULL
, NULL
);
pass = casereader_create_filter_weight (pass, dict, NULL, NULL);
pass = casereader_create_filter_weight (pass, dict, NULL, NULL);
- while (
casereader_read(pass, &c)
)
+ while (
(c = casereader_read (pass)) != NULL
)
{
{
- double val = case_num (
&
c, v);
- double w = dict_get_case_weight (dict,
&
c, NULL);
+ double val = case_num (c, v);
+ double w = dict_get_case_weight (dict, c, NULL);
minimum = MIN (minimum, val);
maximum = MAX (maximum, val);
moments1_add (moments, val, w);
minimum = MIN (minimum, val);
maximum = MAX (maximum, val);
moments1_add (moments, val, w);
- case_
destroy (&
c);
+ case_
unref (
c);
}
casereader_destroy (pass);
}
casereader_destroy (pass);