/* PSPP - a program for statistical analysis.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ 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
#include <config.h>
-#include <data/casereader.h>
+#include "data/casereader.h"
#include <stdlib.h>
-#include <data/casereader-provider.h>
-#include <data/casewriter.h>
-#include <data/variable.h>
-#include <data/dictionary.h>
-#include <libpspp/taint.h>
-#include <libpspp/message.h>
+#include "data/casereader-provider.h"
+#include "data/casewriter.h"
+#include "data/variable.h"
+#include "data/dictionary.h"
+#include "libpspp/taint.h"
+#include "libpspp/message.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
filter->aux = aux;
filter->exclude = exclude;
reader = casereader_create_sequential (
- NULL, casereader_get_value_cnt (filter->subreader), CASENUMBER_MAX,
+ NULL, casereader_get_proto (filter->subreader), CASENUMBER_MAX,
&casereader_filter_class, filter);
taint_propagate (casereader_get_taint (filter->subreader),
casereader_get_taint (reader));
}
/* Internal read function for filtering casereader. */
-static bool
-casereader_filter_read (struct casereader *reader UNUSED, void *filter_,
- struct ccase *c)
+static struct ccase *
+casereader_filter_read (struct casereader *reader UNUSED, void *filter_)
{
struct casereader_filter *filter = filter_;
for (;;)
{
- if (!casereader_read (filter->subreader, c))
- return false;
+ struct ccase *c = casereader_read (filter->subreader);
+ if (c == NULL)
+ return NULL;
else if (filter->include (c, filter->aux))
- return true;
+ return c;
else if (filter->exclude != NULL)
casewriter_write (filter->exclude, c);
else
- case_destroy (c);
+ case_unref (c);
}
}
casewriter, if there is one. */
if (filter->exclude != NULL)
{
- struct ccase c;
- while (casereader_read (filter->subreader, &c))
- if (filter->include (&c, filter->aux))
- case_destroy (&c);
+ struct ccase *c;
+ while ((c = casereader_read (filter->subreader)) != NULL)
+ if (filter->include (c, filter->aux))
+ case_unref (c);
else
- casewriter_write (filter->exclude, &c);
+ casewriter_write (filter->exclude, c);
}
casereader_destroy (filter->subreader);
{
struct casereader_filter_weight *cfw = cfw_;
double value = case_num (c, cfw->weight_var);
- if (value >= 0.0 && !var_is_num_missing (cfw->weight_var, value, MV_ANY))
+ if (value >= 0.0 && !var_is_num_missing (cfw->weight_var, value))
return true;
else
{
struct casereader_filter_missing
{
struct variable **vars; /* Variables whose values to filter. */
- size_t var_cnt; /* Number of variables. */
+ size_t n_vars; /* Number of variables. */
enum mv_class class; /* Types of missing values to filter. */
+ casenumber *n_missing;
};
static bool casereader_filter_missing_include (const struct ccase *, void *);
/* Creates and returns a casereader that filters out cases from
READER that have a missing value in the given CLASS for any of
- the VAR_CNT variables in VARS. Only cases that have
+ the N_VARS variables in VARS. Only cases that have
non-missing values for all of these variables are passed
through.
read or, if that never occurs, until the filtering casereader
is destroyed.
+ If N_MISSING is non-null, then after reading, it will be filled
+ with the total number of dropped cases.
+
After this function is called, READER must not ever again
be referenced directly. It will be destroyed automatically
when the filtering casereader is destroyed. */
struct casereader *
casereader_create_filter_missing (struct casereader *reader,
- const struct variable **vars, size_t var_cnt,
+ const struct variable *const *vars, size_t n_vars,
enum mv_class class,
+ casenumber *n_missing,
struct casewriter *exclude)
{
- if (var_cnt > 0 && class != MV_NEVER)
+ if (n_vars > 0 && class)
{
struct casereader_filter_missing *cfm = xmalloc (sizeof *cfm);
- cfm->vars = xmemdup (vars, sizeof *vars * var_cnt);
- cfm->var_cnt = var_cnt;
+ cfm->vars = xmemdup (vars, sizeof *vars * n_vars);
+ cfm->n_vars = n_vars;
cfm->class = class;
+ cfm->n_missing = n_missing;
+ if (n_missing) *n_missing = 0;
return casereader_create_filter_func (reader,
casereader_filter_missing_include,
casereader_filter_missing_destroy,
const struct casereader_filter_missing *cfm = cfm_;
size_t i;
- for (i = 0; i < cfm->var_cnt; i++)
+ for (i = 0; i < cfm->n_vars; i++)
{
struct variable *var = cfm->vars[i];
const union value *value = case_data (c, var);
- if (var_is_value_missing (var, value, cfm->class))
- return false;
+ if (var_is_value_missing (var, value) & cfm->class)
+ {
+ if (cfm->n_missing)
+ (*cfm->n_missing)++;
+ return false;
+ }
}
return true;
}