X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Fxforms%2Fcount.c;h=8ce2d12576697beb5562fc65fc4a03522ce2a9a0;hb=refs%2Ftags%2Flenny-x64-build40;hp=09e2693f73ca60283f88bba15c1b79588f1dac90;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git
diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c
index 09e2693f..8ce2d125 100644
--- a/src/language/xforms/count.c
+++ b/src/language/xforms/count.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009 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 . */
#include
@@ -27,15 +25,16 @@
#include
#include
#include
-#include
+#include
#include
-#include
#include
#include
#include
#include
#include
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -58,14 +57,14 @@ struct criteria
struct criteria *next;
/* Variables to count. */
- struct variable **vars;
+ const struct variable **vars;
size_t var_cnt;
- /* Count special values?. */
+ /* Count special values? */
bool count_system_missing; /* Count system missing? */
bool count_user_missing; /* Count user missing? */
- /* Criterion values. */
+ /* Criterion values. */
size_t value_cnt;
union
{
@@ -136,10 +135,11 @@ cmd_count (struct lexer *lexer, struct dataset *ds)
for (;;)
{
bool ok;
-
+
crit->next = NULL;
crit->vars = NULL;
- if (!parse_variables (lexer, dataset_dict (ds), &crit->vars, &crit->var_cnt,
+ if (!parse_variables_const (lexer, dataset_dict (ds), &crit->vars,
+ &crit->var_cnt,
PV_DUPLICATE | PV_SAME_TYPE))
goto fail;
pool_register (trns->pool, free, crit->vars);
@@ -177,7 +177,7 @@ cmd_count (struct lexer *lexer, struct dataset *ds)
the same dest var more than once. */
dv->var = dict_lookup_var (dataset_dict (ds), dv->name);
- if (dv->var == NULL)
+ if (dv->var == NULL)
dv->var = dict_create_var_assert (dataset_dict (ds), dv->name, 0);
}
@@ -201,12 +201,12 @@ parse_numeric_criteria (struct lexer *lexer, struct pool *pool, struct criteria
for (;;)
{
double low, high;
-
+
if (lex_match_id (lexer, "SYSMIS"))
crit->count_system_missing = true;
else if (lex_match_id (lexer, "MISSING"))
crit->count_user_missing = true;
- else if (parse_num_range (lexer, &low, &high, NULL))
+ else if (parse_num_range (lexer, &low, &high, NULL))
{
struct num_value *cur;
@@ -268,8 +268,8 @@ parse_string_criteria (struct lexer *lexer, struct pool *pool, struct criteria *
/* Transformation. */
/* Counts the number of values in case C matching CRIT. */
-static inline int
-count_numeric (struct criteria *crit, struct ccase *c)
+static int
+count_numeric (struct criteria *crit, const struct ccase *c)
{
int counter = 0;
size_t i;
@@ -277,31 +277,33 @@ count_numeric (struct criteria *crit, struct ccase *c)
for (i = 0; i < crit->var_cnt; i++)
{
double x = case_num (c, crit->vars[i]);
- if (x == SYSMIS)
- counter += crit->count_system_missing;
- else if (crit->count_user_missing
- && var_is_num_user_missing (crit->vars[i], x))
- counter++;
- else
+ if (var_is_num_missing (crit->vars[i], x, MV_ANY))
+ {
+ if (x == SYSMIS
+ ? crit->count_system_missing
+ : crit->count_user_missing)
+ counter++;
+ }
+ else
{
struct num_value *v;
-
+
for (v = crit->values.num; v < crit->values.num + crit->value_cnt;
- v++)
- if (v->type == CNT_SINGLE ? x == v->a : x >= v->a && x <= v->b)
+ v++)
+ if (v->type == CNT_SINGLE ? x == v->a : x >= v->a && x <= v->b)
{
counter++;
break;
- }
+ }
}
}
-
+
return counter;
}
/* Counts the number of values in case C matching CRIT. */
-static inline int
-count_string (struct criteria *crit, struct ccase *c)
+static int
+count_string (struct criteria *crit, const struct ccase *c)
{
int counter = 0;
size_t i;
@@ -323,12 +325,13 @@ count_string (struct criteria *crit, struct ccase *c)
/* Performs the COUNT transformation T on case C. */
static int
-count_trns_proc (void *trns_, struct ccase *c,
+count_trns_proc (void *trns_, struct ccase **c,
casenumber case_num UNUSED)
{
struct count_trns *trns = trns_;
struct dst_var *dv;
+ *c = case_unshare (*c);
for (dv = trns->dst_vars; dv; dv = dv->next)
{
struct criteria *crit;
@@ -337,10 +340,10 @@ count_trns_proc (void *trns_, struct ccase *c,
counter = 0;
for (crit = dv->crit; crit; crit = crit->next)
if (var_is_numeric (crit->vars[0]))
- counter += count_numeric (crit, c);
+ counter += count_numeric (crit, *c);
else
- counter += count_string (crit, c);
- case_data_rw (c, dv->var)->f = counter;
+ counter += count_string (crit, *c);
+ case_data_rw (*c, dv->var)->f = counter;
}
return TRNS_CONTINUE;
}