(start_case_map): Ditto, and rename case_map_prepare_dict.
(finish_case_map): Ditto, and rename case_map_from_dict.
(map_case): Ditto, and rename case_map_execute.
(destroy_case_map): Ditto, and rename case_map_destroy.
(case_map_get_value_cnt): Ditto.
* automake.mk: Add case-map.c, case-map.h.
* case-map.c: New file.
* case-map.h: New file.
+2007-08-12 Ben Pfaff <blp@gnu.org>
+
+ * automake.mk: Add case-map.c, case-map.h.
+
+ * case-map.c: New file.
+
+ * case-map.h: New file.
+
2007-08-12 Ben Pfaff <blp@gnu.org>
* dictionary.c (dict_compact_values): Don't delete scratch
src/data/any-writer.h \
src/data/calendar.c \
src/data/calendar.h \
+ src/data/case-map.c \
+ src/data/case-map.h \
src/data/case-ordering.c \
src/data/case-ordering.h \
src/data/case.c \
+2007-08-12 Ben Pfaff <blp@gnu.org>
+
+ * get.c (struct case_map): Move into new file src/data/case-map.c.
+ (start_case_map): Ditto, and rename case_map_prepare_dict.
+ (finish_case_map): Ditto, and rename case_map_from_dict.
+ (map_case): Ditto, and rename case_map_execute.
+ (destroy_case_map): Ditto, and rename case_map_destroy.
+ (case_map_get_value_cnt): Ditto.
+
2007-08-12 Ben Pfaff <blp@gnu.org>
* get.c (case_map_get_value_cnt): New function.
--- /dev/null
+/* PSPP - computes sample statistics.
+ Copyright (C) 1997-9, 2000, 2006, 2007 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 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. */
+
+#include <config.h>
+
+#include <language/data-io/case-map.h>
+
+#include <stdlib.h>
+
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <data/variable.h>
+#include <libpspp/assertion.h>
+
+#include "xalloc.h"
+
+/* A case map. */
+struct case_map
+ {
+ size_t value_cnt; /* Number of values in map. */
+ int *map; /* For each destination index, the
+ corresponding source index. */
+ };
+
+/* Prepares dictionary D for producing a case map. Afterward,
+ the caller may delete, reorder, or rename variables within D
+ at will before using finish_case_map() to produce the case
+ map.
+
+ Uses D's aux members, which must otherwise not be in use. */
+void
+case_map_prepare (struct dictionary *d)
+{
+ size_t var_cnt = dict_get_var_cnt (d);
+ size_t i;
+
+ for (i = 0; i < var_cnt; i++)
+ {
+ struct variable *v = dict_get_var (d, i);
+ int *src_fv = xmalloc (sizeof *src_fv);
+ *src_fv = var_get_case_index (v);
+ var_attach_aux (v, src_fv, var_dtor_free);
+ }
+}
+
+/* Produces a case map from dictionary D, which must have been
+ previously prepared with start_case_map().
+
+ Does not retain any reference to D, and clears the aux members
+ set up by start_case_map().
+
+ Returns the new case map, or a null pointer if no mapping is
+ required (that is, no data has changed position). */
+struct case_map *
+case_map_finish (struct dictionary *d)
+{
+ struct case_map *map;
+ size_t var_cnt = dict_get_var_cnt (d);
+ size_t i;
+ int identity_map;
+
+ map = xmalloc (sizeof *map);
+ map->value_cnt = dict_get_next_value_idx (d);
+ map->map = xnmalloc (map->value_cnt, sizeof *map->map);
+ for (i = 0; i < map->value_cnt; i++)
+ map->map[i] = -1;
+
+ identity_map = 1;
+ for (i = 0; i < var_cnt; i++)
+ {
+ struct variable *v = dict_get_var (d, i);
+ size_t value_cnt = var_get_value_cnt (v);
+ int *src_fv = var_detach_aux (v);
+ size_t idx;
+
+ if (var_get_case_index (v) != *src_fv)
+ identity_map = 0;
+
+ for (idx = 0; idx < value_cnt; idx++)
+ {
+ int src_idx = *src_fv + idx;
+ int dst_idx = var_get_case_index (v) + idx;
+
+ assert (map->map[dst_idx] == -1);
+ map->map[dst_idx] = src_idx;
+ }
+ free (src_fv);
+ }
+
+ if (identity_map)
+ {
+ case_map_destroy (map);
+ return NULL;
+ }
+
+ while (map->value_cnt > 0 && map->map[map->value_cnt - 1] == -1)
+ map->value_cnt--;
+
+ return map;
+}
+
+/* Maps from SRC to DST, applying case map MAP. */
+void
+case_map_execute (const struct case_map *map,
+ const struct ccase *src, struct ccase *dst)
+{
+ size_t dst_idx;
+
+ for (dst_idx = 0; dst_idx < map->value_cnt; dst_idx++)
+ {
+ int src_idx = map->map[dst_idx];
+ if (src_idx != -1)
+ *case_data_rw_idx (dst, dst_idx) = *case_data_idx (src, src_idx);
+ }
+}
+
+/* Destroys case map MAP. */
+void
+case_map_destroy (struct case_map *map)
+{
+ if (map != NULL)
+ {
+ free (map->map);
+ free (map);
+ }
+}
--- /dev/null
+/* PSPP - computes sample statistics.
+ Copyright (C) 1997-9, 2000, 2006, 2007 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 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. */
+
+#ifndef LANGUAGE_DATA_IO_CASE_MAP_H
+#define LANGUAGE_DATA_IO_CASE_MAP_H 1
+
+/* Case map.
+
+ A case map copies data from a case that corresponds for one
+ dictionary to a case that corresponds to a second dictionary
+ derived from the first by, optionally, deleting, reordering,
+ or renaming variables. (No new variables may be created.)
+ */
+
+struct dictionary;
+struct ccase;
+
+void case_map_prepare (struct dictionary *);
+struct case_map *case_map_finish (struct dictionary *);
+void case_map_execute (const struct case_map *,
+ const struct ccase *, struct ccase *);
+void case_map_destroy (struct case_map *);
+
+#endif /* language/data-io/case-map.h */
#include <data/any-reader.h>
#include <data/any-writer.h>
#include <data/case.h>
+#include <data/case-map.h>
#include <data/casereader.h>
#include <data/casewriter.h>
#include <data/format.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
-/* Rearranging and reducing a dictionary. */
-static void start_case_map (struct dictionary *);
-static struct case_map *finish_case_map (struct dictionary *);
-static void map_case (const struct case_map *,
- const struct ccase *, struct ccase *);
-static void destroy_case_map (struct case_map *);
-static size_t case_map_get_value_cnt (const struct case_map *);
-
static bool parse_dict_trim (struct lexer *, struct dictionary *);
\f
/* Reading system and portable files. */
if (reader == NULL)
goto error;
- start_case_map (dict);
+ case_map_prepare_dict (dict);
while (lex_token (lexer) != '.')
{
goto error;
}
- map = finish_case_map (dict);
+ map = case_map_from_dict (dict);
if (map != NULL)
reader = casereader_create_translator (reader,
dict_get_next_value_idx (dict),
void *map_)
{
struct case_map *map = map_;
- map_case (map, input, output);
+ case_map_execute (map, input, output);
}
static bool
get_destroy_case_map (void *map_)
{
struct case_map *map = map_;
- destroy_case_map (map);
+ case_map_destroy (map);
return true;
}
\f
sysfile_opts = sfm_writer_default_options ();
porfile_opts = pfm_writer_default_options ();
- start_case_map (dict);
+ case_map_prepare_dict (dict);
dict_delete_scratch_vars (dict);
lex_match (lexer, '/');
if (writer == NULL)
goto error;
- map = finish_case_map (dict);
+ map = case_map_from_dict (dict);
if (map != NULL)
writer = casewriter_create_translator (writer,
case_map_get_value_cnt (map),
error:
casewriter_destroy (writer);
dict_destroy (dict);
- destroy_case_map (map);
+ case_map_destroy (map);
return NULL;
}
\f
return true;
}
-\f
-/* Case map.
-
- A case map copies data from a case that corresponds for one
- dictionary to a case that corresponds to a second dictionary
- derived from the first by, optionally, deleting, reordering,
- or renaming variables. (No new variables may be created.)
- */
-
-/* A case map. */
-struct case_map
- {
- size_t value_cnt; /* Number of values in map. */
- int *map; /* For each destination index, the
- corresponding source index. */
- };
-
-/* Prepares dictionary D for producing a case map. Afterward,
- the caller may delete, reorder, or rename variables within D
- at will before using finish_case_map() to produce the case
- map.
-
- Uses D's aux members, which must otherwise not be in use. */
-static void
-start_case_map (struct dictionary *d)
-{
- size_t var_cnt = dict_get_var_cnt (d);
- size_t i;
-
- for (i = 0; i < var_cnt; i++)
- {
- struct variable *v = dict_get_var (d, i);
- int *src_fv = xmalloc (sizeof *src_fv);
- *src_fv = var_get_case_index (v);
- var_attach_aux (v, src_fv, var_dtor_free);
- }
-}
-
-/* Produces a case map from dictionary D, which must have been
- previously prepared with start_case_map().
-
- Does not retain any reference to D, and clears the aux members
- set up by start_case_map().
-
- Returns the new case map, or a null pointer if no mapping is
- required (that is, no data has changed position). */
-static struct case_map *
-finish_case_map (struct dictionary *d)
-{
- struct case_map *map;
- size_t var_cnt = dict_get_var_cnt (d);
- size_t i;
- int identity_map;
-
- map = xmalloc (sizeof *map);
- map->value_cnt = dict_get_next_value_idx (d);
- map->map = xnmalloc (map->value_cnt, sizeof *map->map);
- for (i = 0; i < map->value_cnt; i++)
- map->map[i] = -1;
-
- identity_map = 1;
- for (i = 0; i < var_cnt; i++)
- {
- struct variable *v = dict_get_var (d, i);
- size_t value_cnt = var_get_value_cnt (v);
- int *src_fv = (int *) var_detach_aux (v);
- size_t idx;
-
- if (var_get_case_index (v) != *src_fv)
- identity_map = 0;
-
- for (idx = 0; idx < value_cnt; idx++)
- {
- int src_idx = *src_fv + idx;
- int dst_idx = var_get_case_index (v) + idx;
-
- assert (map->map[dst_idx] == -1);
- map->map[dst_idx] = src_idx;
- }
- free (src_fv);
- }
-
- if (identity_map)
- {
- destroy_case_map (map);
- return NULL;
- }
-
- while (map->value_cnt > 0 && map->map[map->value_cnt - 1] == -1)
- map->value_cnt--;
-
- return map;
-}
-
-/* Maps from SRC to DST, applying case map MAP. */
-static void
-map_case (const struct case_map *map,
- const struct ccase *src, struct ccase *dst)
-{
- size_t dst_idx;
-
- case_create (dst, map->value_cnt);
- for (dst_idx = 0; dst_idx < map->value_cnt; dst_idx++)
- {
- int src_idx = map->map[dst_idx];
- if (src_idx != -1)
- *case_data_rw_idx (dst, dst_idx) = *case_data_idx (src, src_idx);
- }
-}
-
-/* Destroys case map MAP. */
-static void
-destroy_case_map (struct case_map *map)
-{
- if (map != NULL)
- {
- free (map->map);
- free (map);
- }
-}
-
-/* Returns the number of `union value's in cases created by
- MAP. */
-static size_t
-case_map_get_value_cnt (const struct case_map *map)
-{
- return map->value_cnt;
-}
projects / pspp-builds.git / commitdiff