projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(parse_rank_function) Fix msg() bug found by -Wformat.
[pspp]
/
src
/
descript.c
diff --git
a/src/descript.c
b/src/descript.c
index 0492b33ed2378a232418f368326974eab88eaf00..ba33b263ea51e609116b13548d1bf0c3e0674257 100644
(file)
--- a/
src/descript.c
+++ b/
src/descript.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
/* FIXME: Many possible optimizations. */
/* FIXME: Many possible optimizations. */
@@
-26,8
+26,10
@@
#include <stdlib.h>
#include "algorithm.h"
#include "alloc.h"
#include <stdlib.h>
#include "algorithm.h"
#include "alloc.h"
+#include "case.h"
#include "casefile.h"
#include "command.h"
#include "casefile.h"
#include "command.h"
+#include "dictionary.h"
#include "lexer.h"
#include "error.h"
#include "magic.h"
#include "lexer.h"
#include "error.h"
#include "magic.h"
@@
-118,7
+120,7
@@
static const struct dsc_statistic_info dsc_info[DSC_N_STATS] =
struct dsc_var
{
struct variable *v; /* Variable to calculate on. */
struct dsc_var
{
struct variable *v; /* Variable to calculate on. */
- char z_name[
9];
/* Name for z-score variable. */
+ char z_name[
LONG_NAME_LEN + 1];
/* Name for z-score variable. */
double valid, missing; /* Valid, missing counts. */
struct moments *moments; /* Moments. */
double min, max; /* Maximum and mimimum values. */
double valid, missing; /* Valid, missing counts. */
struct moments *moments; /* Moments. */
double min, max; /* Maximum and mimimum values. */
@@
-261,11
+263,7
@@
cmd_descriptives (void)
else if (lex_match_id ("DEFAULT"))
dsc->show_stats |= DEFAULT_STATS;
else
else if (lex_match_id ("DEFAULT"))
dsc->show_stats |= DEFAULT_STATS;
else
- {
- dsc->show_stats |= 1ul << (match_statistic ());
- if (dsc->show_stats == DSC_NONE)
- dsc->show_stats = DEFAULT_STATS;
- }
+ dsc->show_stats |= 1ul << (match_statistic ());
lex_match (',');
}
if (dsc->show_stats == 0)
lex_match (',');
}
if (dsc->show_stats == 0)
@@
-467,7
+465,7
@@
try_name (struct dsc_proc *dsc, char *name)
if (dict_lookup_var (default_dict, name) != NULL)
return 0;
for (i = 0; i < dsc->var_cnt; i++)
if (dict_lookup_var (default_dict, name) != NULL)
return 0;
for (i = 0; i < dsc->var_cnt; i++)
- if (!strcmp (dsc->vars[i].z_name, name))
+ if (!strc
asec
mp (dsc->vars[i].z_name, name))
return 0;
return 1;
}
return 0;
return 1;
}
@@
-480,12
+478,11
@@
static int
generate_z_varname (struct dsc_proc *dsc, char *z_name,
const char *var_name, int *z_cnt)
{
generate_z_varname (struct dsc_proc *dsc, char *z_name,
const char *var_name, int *z_cnt)
{
- char name[
10
];
+ char name[
LONG_NAME_LEN + 1
];
/* Try a name based on the original variable name. */
name[0] = 'Z';
/* Try a name based on the original variable name. */
name[0] = 'Z';
- strcpy (name + 1, var_name);
- name[8] = '\0';
+ str_copy_trunc (name + 1, sizeof name - 1, var_name);
if (try_name (dsc, name))
{
strcpy (z_name, name);
if (try_name (dsc, name))
{
strcpy (z_name, name);
@@
-569,7
+566,7
@@
dump_z_table (struct dsc_proc *dsc)
*/
static int
descriptives_trns_proc (struct trns_header *trns, struct ccase * c,
*/
static int
descriptives_trns_proc (struct trns_header *trns, struct ccase * c,
- int case_
num
UNUSED)
+ int case_
idx
UNUSED)
{
struct dsc_trns *t = (struct dsc_trns *) trns;
struct dsc_z_score *z;
{
struct dsc_trns *t = (struct dsc_trns *) trns;
struct dsc_z_score *z;
@@
-581,7
+578,7
@@
descriptives_trns_proc (struct trns_header *trns, struct ccase * c,
assert(t->vars);
for (vars = t->vars; vars < t->vars + t->var_cnt; vars++)
{
assert(t->vars);
for (vars = t->vars; vars < t->vars + t->var_cnt; vars++)
{
- double score = c
->data[(*vars)->fv].f
;
+ double score = c
ase_num (c, (*vars)->fv)
;
if ( score == SYSMIS || (!t->include_user_missing
&& is_num_user_missing(score, *vars)) )
{
if ( score == SYSMIS || (!t->include_user_missing
&& is_num_user_missing(score, *vars)) )
{
@@
-593,14
+590,15
@@
descriptives_trns_proc (struct trns_header *trns, struct ccase * c,
for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++)
{
for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++)
{
- double score = c->data[z->src_idx].f;
+ double input = case_num (c, z->src_idx);
+ double *output = &case_data_rw (c, z->dst_idx)->f;
if (z->mean == SYSMIS || z->std_dev == SYSMIS
if (z->mean == SYSMIS || z->std_dev == SYSMIS
- || all_sysmis ||
score
== SYSMIS
- || (!t->include_user_missing && is_num_user_missing(
score
, z->v)))
-
c->data[z->dst_idx].f
= SYSMIS;
+ || all_sysmis ||
input
== SYSMIS
+ || (!t->include_user_missing && is_num_user_missing(
input
, z->v)))
+
*output
= SYSMIS;
else
else
-
c->data[z->dst_idx].f = (score
- z->mean) / z->std_dev;
+
*output = (input
- z->mean) / z->std_dev;
}
return -1;
}
}
return -1;
}
@@
-695,7
+693,7
@@
calc_descriptives (const struct casefile *cf, void *dsc_)
{
struct dsc_proc *dsc = dsc_;
struct casereader *reader;
{
struct dsc_proc *dsc = dsc_;
struct casereader *reader;
-
const struct ccase *
c;
+
struct ccase
c;
int i;
for (i = 0; i < dsc->var_cnt; i++)
int i;
for (i = 0; i < dsc->var_cnt; i++)
@@
-712,15
+710,16
@@
calc_descriptives (const struct casefile *cf, void *dsc_)
dsc->valid = 0.;
/* First pass to handle most of the work. */
dsc->valid = 0.;
/* First pass to handle most of the work. */
- reader = casefile_get_reader (cf);
- while (casereader_read (reader, &c))
+ for (reader = casefile_get_reader (cf);
+ casereader_read (reader, &c);
+ case_destroy (&c))
{
{
- double weight = dict_get_case_weight (default_dict, c, &dsc->bad_warn);
+ double weight = dict_get_case_weight (default_dict,
&
c, &dsc->bad_warn);
if (weight <= 0.0)
if (weight <= 0.0)
-
continue;
+ continue;
/* Check for missing values. */
/* Check for missing values. */
- if (listwise_missing (dsc, c))
+ if (listwise_missing (dsc,
&
c))
{
dsc->missing_listwise += weight;
if (dsc->missing_type == DSC_LISTWISE)
{
dsc->missing_listwise += weight;
if (dsc->missing_type == DSC_LISTWISE)
@@
-731,7
+730,7
@@
calc_descriptives (const struct casefile *cf, void *dsc_)
for (i = 0; i < dsc->var_cnt; i++)
{
struct dsc_var *dv = &dsc->vars[i];
for (i = 0; i < dsc->var_cnt; i++)
{
struct dsc_var *dv = &dsc->vars[i];
- double x = c
->data[dv->v->fv].f
;
+ double x = c
ase_num (&c, dv->v->fv)
;
if (dsc->missing_type != DSC_LISTWISE
&& (x == SYSMIS
if (dsc->missing_type != DSC_LISTWISE
&& (x == SYSMIS
@@
-743,12
+742,7
@@
calc_descriptives (const struct casefile *cf, void *dsc_)
}
if (dv->moments != NULL)
}
if (dv->moments != NULL)
- {
- if (dsc->max_moment > MOMENT_MEAN)
- moments_pass_one (dv->moments, x, weight);
- else
- moments_pass_two (dv->moments, x, weight);
- }
+ moments_pass_one (dv->moments, x, weight);
if (x < dv->min)
dv->min = x;
if (x < dv->min)
dv->min = x;
@@
-761,23
+755,24
@@
calc_descriptives (const struct casefile *cf, void *dsc_)
/* Second pass for higher-order moments. */
if (dsc->max_moment > MOMENT_MEAN)
{
/* Second pass for higher-order moments. */
if (dsc->max_moment > MOMENT_MEAN)
{
- reader = casefile_get_reader (cf);
- while (casereader_read (reader, &c))
+ for (reader = casefile_get_reader (cf);
+ casereader_read (reader, &c);
+ case_destroy (&c))
{
{
- double weight = dict_get_case_weight (default_dict, c,
+ double weight = dict_get_case_weight (default_dict,
&
c,
&dsc->bad_warn);
if (weight <= 0.0)
continue;
/* Check for missing values. */
&dsc->bad_warn);
if (weight <= 0.0)
continue;
/* Check for missing values. */
- if (listwise_missing (dsc, c)
+ if (listwise_missing (dsc,
&
c)
&& dsc->missing_type == DSC_LISTWISE)
continue;
for (i = 0; i < dsc->var_cnt; i++)
{
struct dsc_var *dv = &dsc->vars[i];
&& dsc->missing_type == DSC_LISTWISE)
continue;
for (i = 0; i < dsc->var_cnt; i++)
{
struct dsc_var *dv = &dsc->vars[i];
- double x = c
->data[dv->v->fv].f
;
+ double x = c
ase_num (&c, dv->v->fv)
;
if (dsc->missing_type != DSC_LISTWISE
&& (x == SYSMIS
if (dsc->missing_type != DSC_LISTWISE
&& (x == SYSMIS
@@
-842,7
+837,7
@@
listwise_missing (struct dsc_proc *dsc, const struct ccase *c)
for (i = 0; i < dsc->var_cnt; i++)
{
struct dsc_var *dv = &dsc->vars[i];
for (i = 0; i < dsc->var_cnt; i++)
{
struct dsc_var *dv = &dsc->vars[i];
- double x = c
->data[dv->v->fv].f
;
+ double x = c
ase_num (c, dv->v->fv)
;
if (x == SYSMIS
|| (!dsc->include_user_missing && is_num_user_missing (x, dv->v)))
if (x == SYSMIS
|| (!dsc->include_user_missing && is_num_user_missing (x, dv->v)))
@@
-929,7
+924,7
@@
descriptives_compare_dsc_vars (const void *a_, const void *b_, void *dsc_)
int result;
if (dsc->sort_by_stat == DSC_NAME)
int result;
if (dsc->sort_by_stat == DSC_NAME)
- result = strcmp (a->v->name, b->v->name);
+ result = strc
asec
mp (a->v->name, b->v->name);
else
{
double as = a->stats[dsc->sort_by_stat];
else
{
double as = a->stats[dsc->sort_by_stat];