projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix TEMPORARY bug and add regression test.
[pspp-builds.git]
/
src
/
descript.q
diff --git
a/src/descript.q
b/src/descript.q
index 84bc16c5fabc956d978135b4c3b3cbc8a2477586..72d5bba4bc35834932b3aa1706a38df2da12c419 100644
(file)
--- a/
src/descript.q
+++ b/
src/descript.q
@@
-30,7
+30,6
@@
#include "command.h"
#include "lexer.h"
#include "error.h"
#include "command.h"
#include "lexer.h"
#include "error.h"
-#include "approx.h"
#include "magic.h"
#include "stats.h"
#include "som.h"
#include "magic.h"
#include "stats.h"
#include "som.h"
@@
-477,7
+476,8
@@
dump_z_table (void)
/* Transformation function to calculate Z-scores. */
static int
/* Transformation function to calculate Z-scores. */
static int
-descriptives_trns_proc (struct trns_header * trns, struct ccase * c)
+descriptives_trns_proc (struct trns_header * trns, struct ccase * c,
+ int case_num UNUSED)
{
struct descriptives_trns *t = (struct descriptives_trns *) trns;
struct dsc_z_score *z;
{
struct descriptives_trns *t = (struct descriptives_trns *) trns;
struct dsc_z_score *z;
@@
-539,9
+539,9
@@
run_z_pass (void)
struct variable *d;
t->z[count].s = v;
struct variable *d;
t->z[count].s = v;
- t->z[count].d = d = dict_create_var (default_dict,
- v->p.dsc.zname, 0);
-
assert (d != NULL)
;
+ t->z[count].d = d = dict_create_var
_assert
(default_dict,
+
v->p.dsc.zname, 0);
+
d->init = 0
;
if (v->label)
{
d->label = xmalloc (strlen (v->label) + 12);
if (v->label)
{
d->label = xmalloc (strlen (v->label) + 12);
@@
-556,8
+556,7
@@
run_z_pass (void)
}
t->z[count].mean = v->p.dsc.stats[dsc_mean];
t->z[count].std_dev = v->p.dsc.stats[dsc_stddev];
}
t->z[count].mean = v->p.dsc.stats[dsc_mean];
t->z[count].std_dev = v->p.dsc.stats[dsc_stddev];
- if (t->z[count].std_dev == SYSMIS
- || approx_eq (t->z[count].std_dev, 0.0))
+ if (t->z[count].std_dev == SYSMIS || t->z[count].std_dev == 0.0)
t->z[count].mean = SYSMIS;
count++;
}
t->z[count].mean = SYSMIS;
count++;
}