/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-11, 14 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
struct merge_input inputs[MAX_MERGE_ORDER];
size_t input_cnt;
struct caseproto *proto;
+
+ merge_distinct_combine_func *combine;
+ void *aux;
};
static void do_merge (struct merge *m);
struct merge *
-merge_create (const struct subcase *ordering, const struct caseproto *proto)
+merge_create (const struct subcase *ordering, const struct caseproto *proto,
+ merge_distinct_combine_func *combine, void *aux)
{
struct merge *m = xmalloc (sizeof *m);
subcase_clone (&m->ordering, ordering);
m->input_cnt = 0;
m->proto = caseproto_ref (proto);
+ m->combine = combine;
+ m->aux = aux;
return m;
}
do_merge (struct merge *m)
{
struct casewriter *w;
+ struct ccase *prev_case;
size_t i;
assert (m->input_cnt > 1);
for (i = 0; i < m->input_cnt; )
if (read_input_case (m, i))
i++;
+
+ prev_case = NULL;
while (m->input_cnt > 0)
{
+ struct ccase *min_case;
size_t min;
min = 0;
&m->ordering, m->inputs[min].c) < 0)
min = i;
- casewriter_write (w, m->inputs[min].c);
+ min_case = m->inputs[min].c;
+ if (m->combine != NULL)
+ {
+ if (prev_case == NULL)
+ prev_case = min_case;
+ else if (subcase_equal (&m->ordering, min_case,
+ &m->ordering, prev_case))
+ prev_case = m->combine (prev_case, min_case, m->aux);
+ else
+ {
+ casewriter_write (w, prev_case);
+ prev_case = min_case;
+ }
+ }
+ else
+ casewriter_write (w, min_case);
+
read_input_case (m, min);
}
+ if (prev_case != NULL)
+ casewriter_write (w, prev_case);
m->input_cnt = 1;
m->inputs[0].reader = casewriter_make_reader (w);
}
-