#include <limits.h>
#include <math.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/variable.h>
#include <data/case-ordering.h>
#include <data/case.h>
#include <data/casegrouper.h>
#include <data/casereader.h>
#include <data/casewriter.h>
+#include <data/dictionary.h>
+#include <data/format.h>
+#include <data/missing-values.h>
+#include <data/procedure.h>
+#include <data/short-names.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/stats/sort-criteria.h>
#include <libpspp/compiler.h>
#include <libpspp/taint.h>
#include <math/sort.h>
-#include <output/table.h>
#include <output/manager.h>
+#include <output/table.h>
#include <gsl/gsl_cdf.h>
/* Sort this split group by the BY variables as primary
keys and the rank variable as secondary key. */
- ordering = case_ordering_create (d);
+ ordering = case_ordering_create ();
for (j = 0; j < n_group_vars; j++)
case_ordering_add_var (ordering, group_vars[j], SRT_ASCEND);
case_ordering_add_var (ordering,
input = casereader_create_filter_missing (input, &rank_var, 1,
- exclude_values, output);
+ exclude_values, NULL, output);
input = casereader_create_filter_weight (input, dict, NULL, output);
casereader_split (input, &pass1, &pass2);
/* Put the active file back in its original order. Delete
our sort key, which we don't need anymore. */
{
- struct case_ordering *ordering = case_ordering_create (dataset_dict (ds));
+ struct case_ordering *ordering = case_ordering_create ();
struct casereader *sorted;
case_ordering_add_var (ordering, order, SRT_ASCEND);
/* FIXME: loses error conditions. */