projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't assume that MEASURE_* and ALIGN_* have the same values found in
[pspp]
/
src
/
language
/
stats
/
flip.c
diff --git
a/src/language/stats/flip.c
b/src/language/stats/flip.c
index 0e9b56c5c87ecf7962db9cacd7083d9c29c8f2b8..b1e9c3b423facc42b46500b9ee1e5fc5c145e71b 100644
(file)
--- a/
src/language/stats/flip.c
+++ b/
src/language/stats/flip.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-41,6
+40,7
@@
#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
@@
-48,6
+48,7
@@
#include <libpspp/str.h>
#include "intprops.h"
#include <libpspp/str.h>
#include "intprops.h"
+#include "minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-79,29
+80,30
@@
struct flip_pgm
};
static void destroy_flip_pgm (struct flip_pgm *);
};
static void destroy_flip_pgm (struct flip_pgm *);
-static struct case_sink *flip_sink_create (struct flip_pgm *);
+static struct case_sink *flip_sink_create (struct
dictionary *d, struct
flip_pgm *);
static struct case_source *flip_source_create (struct flip_pgm *);
static bool flip_file (struct flip_pgm *);
static struct case_source *flip_source_create (struct flip_pgm *);
static bool flip_file (struct flip_pgm *);
-static int build_dictionary (struct flip_pgm *);
+static int build_dictionary (struct
dictionary *, struct
flip_pgm *);
static const struct case_source_class flip_source_class;
static const struct case_sink_class flip_sink_class;
/* Parses and executes FLIP. */
int
static const struct case_source_class flip_source_class;
static const struct case_sink_class flip_sink_class;
/* Parses and executes FLIP. */
int
-cmd_flip (
void
)
+cmd_flip (
struct lexer *lexer, struct dataset *ds
)
{
struct flip_pgm *flip;
struct case_sink *sink;
{
struct flip_pgm *flip;
struct case_sink *sink;
+ struct dictionary *dict = dataset_dict (ds);
bool ok;
bool ok;
- if (proc_make_temporary_transformations_permanent ())
+ if (proc_make_temporary_transformations_permanent (
ds
))
msg (SW, _("FLIP ignores TEMPORARY. "
"Temporary transformations will be made permanent."));
flip = pool_create_container (struct flip_pgm, pool);
flip->var = NULL;
msg (SW, _("FLIP ignores TEMPORARY. "
"Temporary transformations will be made permanent."));
flip = pool_create_container (struct flip_pgm, pool);
flip->var = NULL;
- flip->idx_to_fv = dict_get_compacted_
idx_to_fv (default_
dict);
+ flip->idx_to_fv = dict_get_compacted_
dict_index_to_case_index (
dict);
pool_register (flip->pool, free, flip->idx_to_fv);
flip->var_cnt = 0;
flip->case_cnt = 0;
pool_register (flip->pool, free, flip->idx_to_fv);
flip->var_cnt = 0;
flip->case_cnt = 0;
@@
-110,29
+112,29
@@
cmd_flip (void)
flip->new_names_tail = NULL;
flip->file = NULL;
flip->new_names_tail = NULL;
flip->file = NULL;
- lex_match ('/');
- if (lex_match_id ("VARIABLES"))
+ lex_match (
lexer,
'/');
+ if (lex_match_id (
lexer,
"VARIABLES"))
{
{
- lex_match ('=');
- if (!parse_variables (
default_
dict, &flip->var, &flip->var_cnt,
+ lex_match (
lexer,
'=');
+ if (!parse_variables (
lexer,
dict, &flip->var, &flip->var_cnt,
PV_NO_DUPLICATE))
goto error;
PV_NO_DUPLICATE))
goto error;
- lex_match ('/');
+ lex_match (
lexer,
'/');
}
else
}
else
- dict_get_vars (d
efault_d
ict, &flip->var, &flip->var_cnt, 1u << DC_SYSTEM);
+ dict_get_vars (dict, &flip->var, &flip->var_cnt, 1u << DC_SYSTEM);
pool_register (flip->pool, free, flip->var);
pool_register (flip->pool, free, flip->var);
- lex_match ('/');
- if (lex_match_id ("NEWNAMES"))
+ lex_match (
lexer,
'/');
+ if (lex_match_id (
lexer,
"NEWNAMES"))
{
{
- lex_match ('=');
- flip->new_names = parse_variable ();
+ lex_match (
lexer,
'=');
+ flip->new_names = parse_variable (
lexer, dict
);
if (!flip->new_names)
goto error;
}
else
if (!flip->new_names)
goto error;
}
else
- flip->new_names = dict_lookup_var (d
efault_d
ict, "CASE_LBL");
+ flip->new_names = dict_lookup_var (dict, "CASE_LBL");
if (flip->new_names)
{
if (flip->new_names)
{
@@
-149,34
+151,34
@@
cmd_flip (void)
/* Read the active file into a flip_sink. */
flip->case_cnt = 0;
/* Read the active file into a flip_sink. */
flip->case_cnt = 0;
- proc_make_temporary_transformations_permanent ();
- sink = flip_sink_create (flip);
+ proc_make_temporary_transformations_permanent (
ds
);
+ sink = flip_sink_create (
dict,
flip);
if (sink == NULL)
goto error;
if (sink == NULL)
goto error;
- proc_set_sink (sink);
+ proc_set_sink (
ds,
sink);
flip->new_names_tail = NULL;
flip->new_names_tail = NULL;
- ok = procedure (NULL, NULL);
+ ok = procedure (
ds,
NULL, NULL);
/* Flip the data we read. */
if (!flip_file (flip))
{
/* Flip the data we read. */
if (!flip_file (flip))
{
- discard_variables ();
+ discard_variables (
ds
);
goto error;
}
/* Flip the dictionary. */
goto error;
}
/* Flip the dictionary. */
- dict_clear (d
efault_d
ict);
- if (!build_dictionary (flip))
+ dict_clear (dict);
+ if (!build_dictionary (
dict,
flip))
{
{
- discard_variables ();
+ discard_variables (
ds
);
goto error;
}
goto error;
}
- flip->case_size = dict_get_case_size (d
efault_d
ict);
+ flip->case_size = dict_get_case_size (dict);
/* Set up flipped data for reading. */
/* Set up flipped data for reading. */
- proc_set_source (flip_source_create (flip));
+ proc_set_source (
ds,
flip_source_create (flip));
- return ok ? lex_end_of_command () : CMD_CASCADING_FAILURE;
+ return ok ? lex_end_of_command (
lexer
) : CMD_CASCADING_FAILURE;
error:
destroy_flip_pgm (flip);
error:
destroy_flip_pgm (flip);
@@
-194,7
+196,7
@@
destroy_flip_pgm (struct flip_pgm *flip)
/* Make a new variable with base name NAME, which is bowdlerized and
mangled until acceptable, and returns success. */
static int
/* Make a new variable with base name NAME, which is bowdlerized and
mangled until acceptable, and returns success. */
static int
-make_new_var (char name[])
+make_new_var (
struct dictionary *dict,
char name[])
{
char *cp;
{
char *cp;
@@
-218,7
+220,7
@@
make_new_var (char name[])
*cp = '\0';
str_uppercase (name);
*cp = '\0';
str_uppercase (name);
- if (dict_create_var (d
efault_d
ict, name, 0))
+ if (dict_create_var (dict, name, 0))
return 1;
/* Add numeric extensions until acceptable. */
return 1;
/* Add numeric extensions until acceptable. */
@@
-229,11
+231,11
@@
make_new_var (char name[])
for (i = 1; i < 10000000; i++)
{
for (i = 1; i < 10000000; i++)
{
- int ofs =
min
(7 - intlog10 (i), len);
+ int ofs =
MIN
(7 - intlog10 (i), len);
memcpy (n, name, ofs);
sprintf (&n[ofs], "%d", i);
memcpy (n, name, ofs);
sprintf (&n[ofs], "%d", i);
- if (dict_create_var (d
efault_d
ict, n, 0))
+ if (dict_create_var (dict, n, 0))
return 1;
}
}
return 1;
}
}
@@
-244,9
+246,9
@@
make_new_var (char name[])
/* Make a new dictionary for all the new variable names. */
static int
/* Make a new dictionary for all the new variable names. */
static int
-build_dictionary (struct flip_pgm *flip)
+build_dictionary (struct
dictionary *dict, struct
flip_pgm *flip)
{
{
- dict_create_var_assert (d
efault_d
ict, "CASE_LBL", 8);
+ dict_create_var_assert (dict, "CASE_LBL", 8);
if (flip->new_names_head == NULL)
{
if (flip->new_names_head == NULL)
{
@@
-264,7
+266,7
@@
build_dictionary (struct flip_pgm *flip)
char s[SHORT_NAME_LEN + 1];
sprintf (s, "VAR%03d", i);
char s[SHORT_NAME_LEN + 1];
sprintf (s, "VAR%03d", i);
- v = dict_create_var_assert (d
efault_d
ict, s, 0);
+ v = dict_create_var_assert (dict, s, 0);
}
}
else
}
}
else
@@
-272,7
+274,7
@@
build_dictionary (struct flip_pgm *flip)
struct varname *v;
for (v = flip->new_names_head; v; v = v->next)
struct varname *v;
for (v = flip->new_names_head; v; v = v->next)
- if (!make_new_var (v->name))
+ if (!make_new_var (
dict,
v->name))
return 0;
}
return 0;
}
@@
-281,7
+283,7
@@
build_dictionary (struct flip_pgm *flip)
/* Creates a flip sink based on FLIP. */
static struct case_sink *
/* Creates a flip sink based on FLIP. */
static struct case_sink *
-flip_sink_create (struct flip_pgm *flip)
+flip_sink_create (struct
dictionary *dict, struct
flip_pgm *flip)
{
size_t i;
{
size_t i;
@@
-298,7
+300,7
@@
flip_sink_create (struct flip_pgm *flip)
/* Write variable names as first case. */
for (i = 0; i < flip->var_cnt; i++)
buf_copy_str_rpad (flip->output_buf[i].s, MAX_SHORT_STRING,
/* Write variable names as first case. */
for (i = 0; i < flip->var_cnt; i++)
buf_copy_str_rpad (flip->output_buf[i].s, MAX_SHORT_STRING,
-
flip->var[i]->name
);
+
var_get_name (flip->var[i])
);
if (fwrite (flip->output_buf, sizeof *flip->output_buf,
flip->var_cnt, flip->file) != (size_t) flip->var_cnt)
{
if (fwrite (flip->output_buf, sizeof *flip->output_buf,
flip->var_cnt, flip->file) != (size_t) flip->var_cnt)
{
@@
-308,7
+310,7
@@
flip_sink_create (struct flip_pgm *flip)
flip->case_cnt = 1;
flip->case_cnt = 1;
- return create_case_sink (&flip_sink_class, d
efault_d
ict, flip);
+ return create_case_sink (&flip_sink_class, dict, flip);
}
/* Writes case C to the FLIP sink.
}
/* Writes case C to the FLIP sink.
@@
-324,10
+326,11
@@
flip_sink_write (struct case_sink *sink, const struct ccase *c)
if (flip->new_names != NULL)
{
struct varname *v = pool_alloc (flip->pool, sizeof *v);
if (flip->new_names != NULL)
{
struct varname *v = pool_alloc (flip->pool, sizeof *v);
+ int fv = flip->idx_to_fv[var_get_dict_index (flip->new_names)];
v->next = NULL;
v->next = NULL;
- if (
flip->new_names->type == NUMERIC)
+ if (
var_is_numeric (flip->new_names))
{
{
- double f = case_num
(c, flip->idx_to_fv[flip->new_names->index]
);
+ double f = case_num
_idx (c, fv
);
if (f == SYSMIS)
strcpy (v->name, "VSYSMIS");
if (f == SYSMIS)
strcpy (v->name, "VSYSMIS");
@@
-340,9
+343,8
@@
flip_sink_write (struct case_sink *sink, const struct ccase *c)
}
else
{
}
else
{
- int width = min (flip->new_names->width, MAX_SHORT_STRING);
- memcpy (v->name, case_str (c, flip->idx_to_fv[flip->new_names->index]),
- width);
+ int width = MIN (var_get_width (flip->new_names), MAX_SHORT_STRING);
+ memcpy (v->name, case_str_idx (c, fv), width);
v->name[width] = 0;
}
v->name[width] = 0;
}
@@
-358,8
+360,11
@@
flip_sink_write (struct case_sink *sink, const struct ccase *c)
{
double out;
{
double out;
- if (flip->var[i]->type == NUMERIC)
- out = case_num (c, flip->idx_to_fv[flip->var[i]->index]);
+ if (var_is_numeric (flip->var[i]))
+ {
+ int fv = flip->idx_to_fv[var_get_dict_index (flip->var[i])];
+ out = case_num_idx (c, fv);
+ }
else
out = SYSMIS;
flip->output_buf[i].f = out;
else
out = SYSMIS;
flip->output_buf[i].f = out;
@@
-428,7
+433,7
@@
flip_file (struct flip_pgm *flip)
for (case_idx = 0; case_idx < flip->case_cnt; )
{
for (case_idx = 0; case_idx < flip->case_cnt; )
{
- unsigned long read_cases =
min
(flip->case_cnt - case_idx,
+ unsigned long read_cases =
MIN
(flip->case_cnt - case_idx,
case_capacity);
size_t i;
case_capacity);
size_t i;
@@
-538,13
+543,13
@@
flip_source_read (struct case_source *source,
else if (feof (flip->file))
msg (SE, _("Unexpected end of file reading FLIP temporary file."));
else
else if (feof (flip->file))
msg (SE, _("Unexpected end of file reading FLIP temporary file."));
else
-
abort
();
+
NOT_REACHED
();
ok = false;
break;
}
for (j = 0; j < flip->case_cnt; j++)
ok = false;
break;
}
for (j = 0; j < flip->case_cnt; j++)
- case_data_rw (c, j)->f = input_buf[j].f;
+ case_data_rw
_idx
(c, j)->f = input_buf[j].f;
ok = write_case (wc_data);
}
free (input_buf);
ok = write_case (wc_data);
}
free (input_buf);