-/* PSPP - computes sample statistics.
- Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2007, 2009, 2011 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* FIXME: error checking. */
/* FIXME: merge pattern should be improved, this one causes a
performance regression. */
#include <config.h>
-#include <math/merge.h>
+#include "math/merge.h"
-#include <data/case-ordering.h>
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/taint.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/subcase.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/taint.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
#define MAX_MERGE_ORDER 7
-struct merge_input
+struct merge_input
{
struct casereader *reader;
- struct ccase c;
+ struct ccase *c;
};
-struct merge
+struct merge
{
- struct case_ordering *ordering;
+ struct subcase ordering;
struct merge_input inputs[MAX_MERGE_ORDER];
- size_t input_cnt;
+ size_t n_inputs;
+ struct caseproto *proto;
};
static void do_merge (struct merge *m);
struct merge *
-merge_create (const struct case_ordering *ordering)
+merge_create (const struct subcase *ordering, const struct caseproto *proto)
{
struct merge *m = xmalloc (sizeof *m);
- m->ordering = case_ordering_clone (ordering);
- m->input_cnt = 0;
+ subcase_clone (&m->ordering, ordering);
+ m->n_inputs = 0;
+ m->proto = caseproto_ref (proto);
return m;
}
void
-merge_destroy (struct merge *m)
+merge_destroy (struct merge *m)
{
- if (m != NULL)
+ if (m != NULL)
{
size_t i;
-
- case_ordering_destroy (m->ordering);
- for (i = 0; i < m->input_cnt; i++)
+
+ subcase_destroy (&m->ordering);
+ for (i = 0; i < m->n_inputs; i++)
casereader_destroy (m->inputs[i].reader);
+ caseproto_unref (m->proto);
free (m);
}
}
void
-merge_append (struct merge *m, struct casereader *r)
+merge_append (struct merge *m, struct casereader *r)
{
r = casereader_rename (r);
- m->inputs[m->input_cnt++].reader = r;
- if (m->input_cnt >= MAX_MERGE_ORDER)
+ m->inputs[m->n_inputs++].reader = r;
+ if (m->n_inputs >= MAX_MERGE_ORDER)
do_merge (m);
}
struct casereader *
-merge_make_reader (struct merge *m)
+merge_make_reader (struct merge *m)
{
- struct casereader *r;
-
- if (m->input_cnt > 1)
+ struct casereader *r = NULL;
+
+ if (m->n_inputs > 1)
do_merge (m);
- if (m->input_cnt == 1)
+ if (m->n_inputs == 1)
{
r = m->inputs[0].reader;
- m->input_cnt = 0;
+ m->n_inputs = 0;
}
- else if (m->input_cnt == 0)
+ else if (m->n_inputs == 0)
{
- size_t value_cnt = case_ordering_get_value_cnt (m->ordering);
- struct casewriter *writer = mem_writer_create (value_cnt);
+ struct casewriter *writer = mem_writer_create (m->proto);
r = casewriter_make_reader (writer);
}
else
}
static bool
-read_input_case (struct merge *m, size_t idx)
+read_input_case (struct merge *m, size_t idx)
{
struct merge_input *i = &m->inputs[idx];
- if (casereader_read (i->reader, &i->c))
+ i->c = casereader_read (i->reader);
+ if (i->c)
return true;
else
{
casereader_destroy (i->reader);
- remove_element (m->inputs, m->input_cnt, sizeof *m->inputs, idx);
- m->input_cnt--;
+ remove_element (m->inputs, m->n_inputs, sizeof *m->inputs, idx);
+ m->n_inputs--;
return false;
- }
+ }
}
static void
-do_merge (struct merge *m)
+do_merge (struct merge *m)
{
struct casewriter *w;
size_t i;
-
- assert (m->input_cnt > 1);
- w = tmpfile_writer_create (case_ordering_get_value_cnt (m->ordering));
- for (i = 0; i < m->input_cnt; i++)
+ assert (m->n_inputs > 1);
+
+ w = tmpfile_writer_create (m->proto);
+ for (i = 0; i < m->n_inputs; i++)
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
-
- for (i = 0; i < m->input_cnt; )
+
+ for (i = 0; i < m->n_inputs;)
if (read_input_case (m, i))
i++;
- while (m->input_cnt > 0)
+ while (m->n_inputs > 0)
{
size_t min;
min = 0;
- for (i = 1; i < m->input_cnt; i++)
- if (case_ordering_compare_cases (&m->inputs[i].c, &m->inputs[min].c,
- m->ordering) < 0)
+ for (i = 1; i < m->n_inputs; i++)
+ if (subcase_compare_3way (&m->ordering, m->inputs[i].c,
+ &m->ordering, m->inputs[min].c) < 0)
min = i;
- casewriter_write (w, &m->inputs[min].c);
+ casewriter_write (w, m->inputs[min].c);
read_input_case (m, min);
}
- m->input_cnt = 1;
+ m->n_inputs = 1;
m->inputs[0].reader = casewriter_make_reader (w);
}
projects / pspp / blobdiff