[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch 13/19] add case initialization infrastructure
From: |
blp |
Subject: |
[patch 13/19] add case initialization infrastructure |
Date: |
Tue, 05 Jun 2007 23:27:40 -0700 |
User-agent: |
quilt/0.45-1 |
Until now, the procedure code has provided a case to the case_source,
which has filled in the data values that come from the active file.
"Left" data values that don't come from the active file naturally stay
the same from case to case, because the procedure code keeps using
that same case.
One of the compromises that comes with the new procedure code is that
the active file allocates and provides its own case, which the
procedure code then has to resize to provide room for any other
variables that should go in the case and then fill in the values of
"left" variables. Then, when we're done with that case, we have to
save the values of "left" variables to copy into the next case read
from the active file.
The caseinit code helps with this.
Index: merge/src/data/caseinit.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ merge/src/data/caseinit.h 2007-06-05 09:18:06.000000000 -0700
@@ -0,0 +1,36 @@
+/* PSPP - computes sample statistics.
+ Copyright (C) 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 DATA_CASEINIT_H
+#define DATA_CASEINIT_H 1
+
+struct dictionary;
+struct ccase;
+
+struct caseinit *caseinit_create (void);
+void caseinit_clear (struct caseinit *);
+void caseinit_destroy (struct caseinit *);
+
+void caseinit_mark_as_preinited (struct caseinit *, const struct dictionary *);
+void caseinit_mark_for_init (struct caseinit *, const struct dictionary *);
+
+void caseinit_init_reinit_vars (const struct caseinit *, struct ccase *);
+void caseinit_init_left_vars (const struct caseinit *, struct ccase *);
+void caseinit_update_left_vars (struct caseinit *, const struct ccase *);
+
+#endif /* data/caseinit.h */
Index: merge/src/data/caseinit.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ merge/src/data/caseinit.c 2007-06-05 09:18:06.000000000 -0700
@@ -0,0 +1,229 @@
+/* PSPP - computes sample statistics.
+ Copyright (C) 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 <data/caseinit.h>
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <libpspp/array.h>
+#include <libpspp/assertion.h>
+#include <libpspp/compiler.h>
+
+#include "xalloc.h"
+
+struct init_value
+ {
+ union value value;
+ size_t case_index;
+ };
+
+struct init_list
+ {
+ struct init_value *values;
+ size_t cnt;
+ };
+
+enum leave_class
+ {
+ LEAVE_REINIT = 0x001,
+ LEAVE_LEFT = 0x002
+ };
+
+static void
+init_list_create (struct init_list *list)
+{
+ list->values = NULL;
+ list->cnt = 0;
+}
+
+static void
+init_list_clear (struct init_list *list)
+{
+ free (list->values);
+ init_list_create (list);
+}
+
+static void
+init_list_destroy (struct init_list *list)
+{
+ init_list_clear (list);
+}
+
+static int
+compare_init_values (const void *a_, const void *b_, const void *aux UNUSED)
+{
+ const struct init_value *a = a_;
+ const struct init_value *b = b_;
+
+ return a->case_index < b->case_index ? -1 : a->case_index > b->case_index;
+}
+
+static bool
+init_list_includes (const struct init_list *list, size_t case_index)
+{
+ struct init_value value;
+ value.case_index = case_index;
+ return binary_search (list->values, list->cnt, sizeof *list->values,
+ &value, compare_init_values, NULL) != NULL;
+}
+
+static void
+init_list_mark (struct init_list *list, const struct init_list *exclude,
+ enum leave_class include, const struct dictionary *d)
+{
+ size_t var_cnt = dict_get_var_cnt (d);
+ size_t i;
+
+ assert (list != exclude);
+ list->values = xnrealloc (list->values,
+ list->cnt + dict_get_next_value_idx (d),
+ sizeof *list->values);
+ for (i = 0; i < var_cnt; i++)
+ {
+ struct variable *v = dict_get_var (d, i);
+ size_t case_index = var_get_case_index (v);
+ int offset;
+
+ /* Only include the correct class. */
+ if (!(include & (var_get_leave (v) ? LEAVE_LEFT : LEAVE_REINIT)))
+ continue;
+
+ /* Don't include those to be excluded. */
+ if (exclude != NULL && init_list_includes (exclude, case_index))
+ continue;
+
+ offset = 0;
+ do
+ {
+ struct init_value *iv = &list->values[list->cnt++];
+ iv->case_index = case_index++;
+ if (var_is_numeric (v))
+ iv->value.f = var_get_leave (v) ? 0 : SYSMIS;
+ else
+ memset (iv->value.s, ' ', sizeof iv->value.s);
+
+ offset += sizeof iv->value.s;
+ }
+ while (offset < var_get_width (v));
+ }
+
+ /* Drop duplicates. */
+ list->cnt = sort_unique (list->values, list->cnt, sizeof *list->values,
+ compare_init_values, NULL);
+
+}
+
+static void
+init_list_init (const struct init_list *list, struct ccase *c)
+{
+ size_t i;
+
+ for (i = 0; i < list->cnt; i++)
+ {
+ const struct init_value *value = &list->values[i];
+ *case_data_rw_idx (c, value->case_index) = value->value;
+ }
+}
+
+static void
+init_list_update (const struct init_list *list, const struct ccase *c)
+{
+ size_t i;
+
+ for (i = 0; i < list->cnt; i++)
+ {
+ struct init_value *value = &list->values[i];
+ value->value = *case_data_idx (c, value->case_index);
+ }
+}
+
+struct caseinit
+ {
+ struct init_list preinited_values;
+ struct init_list reinit_values;
+ struct init_list left_values;
+ };
+
+struct caseinit *
+caseinit_create (void)
+{
+ struct caseinit *ci = xmalloc (sizeof *ci);
+ init_list_create (&ci->preinited_values);
+ init_list_create (&ci->reinit_values);
+ init_list_create (&ci->left_values);
+ return ci;
+}
+
+void
+caseinit_clear (struct caseinit *ci)
+{
+ init_list_clear (&ci->preinited_values);
+ init_list_clear (&ci->reinit_values);
+ init_list_clear (&ci->left_values);
+}
+
+void
+caseinit_destroy (struct caseinit *ci)
+{
+ if (ci != NULL)
+ {
+ init_list_destroy (&ci->preinited_values);
+ init_list_destroy (&ci->reinit_values);
+ init_list_destroy (&ci->left_values);
+ free (ci);
+ }
+}
+
+void
+caseinit_mark_as_preinited (struct caseinit *ci, const struct dictionary *d)
+{
+ init_list_mark (&ci->preinited_values, NULL, LEAVE_REINIT | LEAVE_LEFT, d);
+}
+
+void
+caseinit_mark_for_init (struct caseinit *ci, const struct dictionary *d)
+{
+ init_list_mark (&ci->reinit_values, &ci->preinited_values, LEAVE_REINIT, d);
+ init_list_mark (&ci->left_values, &ci->preinited_values, LEAVE_LEFT, d);
+}
+
+void
+caseinit_init_reinit_vars (const struct caseinit *ci, struct ccase *c)
+{
+ init_list_init (&ci->reinit_values, c);
+}
+
+void caseinit_init_left_vars (const struct caseinit *ci, struct ccase *c)
+{
+ init_list_init (&ci->left_values, c);
+}
+
+void
+caseinit_update_left_vars (struct caseinit *ci, const struct ccase *c)
+{
+ init_list_update (&ci->left_values, c);
+}
+
--
- Re: [patch 02/19] new function get_workspace_cases, (continued)
- [patch 06/19] sliding window of cases, blp, 2007/06/06
- [patch 04/19] temporary file for array of cases, blp, 2007/06/06
- [patch 09/19] casegrouper implementation, blp, 2007/06/06
- [patch 01/19] move casenumber to case.h, blp, 2007/06/06
- [patch 13/19] add case initialization infrastructure,
blp <=
- [patch 17/19] Start writing developers guide., blp, 2007/06/06
- [patch 15/19] the big patch, blp, 2007/06/06
- [patch 16/19] Implement FIRST and LAST on MATCH FILES., blp, 2007/06/06
- [patch 07/19] casereader and casewriter implementation, blp, 2007/06/06