/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+ Copyright (C) 1997-9, 2000, 2006 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
#include <data/case.h>
#include <data/casefile.h>
#include <data/fastfile.h>
+#include <data/casefile-factory.h>
+#include <data/fastfile-factory.h>
#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <data/storage-stream.h>
-#include <language/expressions/public.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
static int compare_record (const struct ccase *, const struct ccase *,
const struct sort_criteria *);
static struct casefile *do_internal_sort (struct casereader *,
- const struct sort_criteria *);
+ const struct sort_criteria *,
+ struct casefile_factory *
+ );
static struct casefile *do_external_sort (struct casereader *,
- const struct sort_criteria *);
+ const struct sort_criteria *,
+ struct casefile_factory *
+ );
/* Sorts the active file in-place according to CRITERIA.
return false;
in = proc_capture_output (ds);
- out = sort_execute (casefile_get_destructive_reader (in), criteria);
+ out = sort_execute (casefile_get_destructive_reader (in), criteria,
+ dataset_get_casefile_factory (ds));
if (out == NULL)
return false;
{
const struct sort_criteria *criteria;
struct casefile *output;
+ struct casefile_factory *factory ;
};
/* Sorts casefile CF according to the criteria in CB_DATA. */
sort_to_casefile_callback (const struct casefile *cf, void *cb_data_)
{
struct sort_to_casefile_cb_data *cb_data = cb_data_;
- cb_data->output = sort_execute (casefile_get_reader (cf, NULL), cb_data->criteria);
+ cb_data->output = sort_execute (casefile_get_reader (cf, NULL),
+ cb_data->criteria,
+ cb_data->factory
+ );
return cb_data->output != NULL;
}
cb_data.criteria = criteria;
cb_data.output = NULL;
+ cb_data.factory = dataset_get_casefile_factory (ds);
if (!multipass_procedure (ds, sort_to_casefile_callback, &cb_data))
{
casefile_destroy (cb_data.output);
/* Reads all the cases from READER, which is destroyed. Sorts
the cases according to CRITERIA. Returns the sorted cases in
- a newly created casefile. */
+ a newly created casefile, which will be created by FACTORY.
+ If FACTORY is NULL, then a local fastfile_factory will be used.
+*/
struct casefile *
-sort_execute (struct casereader *reader, const struct sort_criteria *criteria)
+sort_execute (struct casereader *reader,
+ const struct sort_criteria *criteria,
+ struct casefile_factory *factory
+ )
{
- struct casefile *output = do_internal_sort (reader, criteria);
+ struct casefile_factory *local_factory = NULL;
+ struct casefile *output ;
+ if ( factory == NULL )
+ factory = local_factory = fastfile_factory_create ();
+
+ output = do_internal_sort (reader, criteria, factory);
if (output == NULL)
- output = do_external_sort (reader, criteria);
+ output = do_external_sort (reader, criteria, factory);
casereader_destroy (reader);
+
+ fastfile_factory_destroy (local_factory);
+
return output;
}
\f
casefile for the data. Otherwise, return a null pointer. */
static struct casefile *
do_internal_sort (struct casereader *reader,
- const struct sort_criteria *criteria)
+ const struct sort_criteria *criteria,
+ struct casefile_factory *factory)
{
const struct casefile *src;
struct casefile *dst;
return NULL;
case_cnt = casefile_get_case_cnt (src);
- dst = fastfile_create (casefile_get_value_cnt (src));
+ dst = factory->create_casefile (factory, casefile_get_value_cnt (src));
if (case_cnt != 0)
{
struct indexed_case *cases = nmalloc (sizeof *cases, case_cnt);
size_t value_cnt; /* Size of data in `union value's. */
struct casefile **runs; /* Array of initial runs. */
size_t run_cnt, run_cap; /* Number of runs, allocated capacity. */
+ struct casefile_factory *factory; /* Factory used to create the result */
};
/* Prototypes for helper functions. */
pattern that assures stability. */
static struct casefile *
do_external_sort (struct casereader *reader,
- const struct sort_criteria *criteria)
+ const struct sort_criteria *criteria,
+ struct casefile_factory *factory
+ )
{
struct external_sort *xsrt;
xsrt->run_cap = 512;
xsrt->run_cnt = 0;
xsrt->runs = xnmalloc (xsrt->run_cap, sizeof *xsrt->runs);
+ xsrt->factory = factory;
if (write_runs (xsrt, reader))
{
struct casefile *output = merge (xsrt);
if (c->width == 0)
{
- double af = case_num (a, c->fv);
- double bf = case_num (b, c->fv);
+ double af = case_num_idx (a, c->fv);
+ double bf = case_num_idx (b, c->fv);
result = af < bf ? -1 : af > bf;
}
else
- result = memcmp (case_str (a, c->fv), case_str (b, c->fv), c->width);
+ result = memcmp (case_str_idx (a, c->fv),
+ case_str_idx (b, c->fv), c->width);
if (result != 0)
return c->dir == SRT_ASCEND ? result : -result;
{
irs->run++;
irs->case_cnt = 0;
+
+ /* This casefile is internal to the sort, so don't use the factory
+ to create it. */
irs->casefile = fastfile_create (irs->xsrt->value_cnt);
casefile_to_disk (irs->casefile);
case_nullify (&irs->last_output);
{
while (xsrt->run_cnt > 1)
{
- int order = min (MAX_MERGE_ORDER, xsrt->run_cnt);
+ int order = MIN (MAX_MERGE_ORDER, xsrt->run_cnt);
int idx = choose_merge (xsrt->runs, xsrt->run_cnt, order);
xsrt->runs[idx] = merge_once (xsrt, xsrt->runs + idx, order);
remove_range (xsrt->runs, xsrt->run_cnt, sizeof *xsrt->runs,
}
/* Create output file. */
- output = fastfile_create (xsrt->value_cnt);
+ output = xsrt->factory->create_casefile (xsrt->factory, xsrt->value_cnt);
casefile_to_disk (output);
/* Merge. */