projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AGGREGATE: Simplify code.
[pspp]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index 7430b819e90a2889aa4cb57be6575b180293335a..15376f62b88142c10fadbcba0720519df66a890c 100644
(file)
--- a/
src/language/stats/aggregate.c
+++ b/
src/language/stats/aggregate.c
@@
-87,16
+87,6
@@
struct agr_var
struct casewriter *writer;
};
struct casewriter *writer;
};
-/* Aggregation functions. */
-enum
- {
- SUM, MEAN, MEDIAN, SD, MAX, MIN, PGT, PLT, PIN, POUT, FGT, FLT, FIN,
- FOUT, N, NU, NMISS, NUMISS, FIRST, LAST,
-
- FUNC = 0x1f, /* Function mask. */
- FSTRING = 1<<5, /* String function bit. */
- };
-
/* Attributes of aggregation functions. */
const struct agr_func agr_func_tab[] =
/* Attributes of aggregation functions. */
const struct agr_func agr_func_tab[] =
@@
-463,14
+453,8
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
goto error;
}
goto error;
}
- exclude = MV_ANY;
-
ds_assign_string (&function_name, lex_tokstr (lexer));
ds_assign_string (&function_name, lex_tokstr (lexer));
-
- ds_chomp (&function_name, '.');
-
- if (lex_tokid(lexer)[strlen (lex_tokid (lexer)) - 1] == '.')
- exclude = MV_SYSTEM;
+ exclude = ds_chomp (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
if (!strcasecmp (function->name, ds_cstr (&function_name)))
for (function = agr_func_tab; function->name; function++)
if (!strcasecmp (function->name, ds_cstr (&function_name)))
@@
-637,12
+621,16
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
struct fmt_spec f;
v->src = NULL;
destvar = dict_create_var (agr->dict, dest[i], 0);
struct fmt_spec f;
v->src = NULL;
destvar = dict_create_var (agr->dict, dest[i], 0);
- if (func_index == N && dict_get_weight (dict) != NULL)
- f = fmt_for_output (FMT_F, 8, 2);
- else
- f = function->format;
- var_set_both_formats (destvar, &f);
- }
+ if (destvar != NULL)
+ {
+ if ((func_index == N || func_index == NMISS)
+ && dict_get_weight (dict) != NULL)
+ f = fmt_for_output (FMT_F, 8, 2);
+ else
+ f = function->format;
+ var_set_both_formats (destvar, &f);
+ }
+ }
if (!destvar)
{
if (!destvar)
{
@@
-1003,21
+991,22
@@
dump_aggregate_info (const struct agr_proc *agr, struct casewriter *output, cons
break;
case MEDIAN:
{
break;
case MEDIAN:
{
- struct casereader *sorted_reader;
- struct percentile *median = percentile_create (0.5, i->cc);
- struct order_stats *os = &median->parent;
-
- sorted_reader = casewriter_make_reader (i->writer);
-
- order_stats_accumulate (&os, 1,
- sorted_reader,
- i->weight,
- i->subject,
- i->exclude);
-
- v->f = percentile_calculate (median, PC_HAVERAGE);
-
- statistic_destroy (&median->parent.parent);
+ if ( i->writer)
+ {
+ struct percentile *median = percentile_create (0.5, i->cc);
+ struct order_stats *os = &median->parent;
+ struct casereader *sorted_reader = casewriter_make_reader (i->writer);
+ i->writer = NULL;
+
+ order_stats_accumulate (&os, 1,
+ sorted_reader,
+ i->weight,
+ i->subject,
+ i->exclude);
+ i->dbl[0] = percentile_calculate (median, PC_HAVERAGE);
+ statistic_destroy (&median->parent.parent);
+ }
+ v->f = i->dbl[0];
}
break;
case SD:
}
break;
case SD: