Categoricals cleanup: New structure 'payload' which reduces the

[pspp-builds.git] / src / math / interaction.c

diff --git a/src/math/interaction.c b/src/math/interaction.c
index d81eba5095b613231c5deef69d9e68f90c97ff27..706092476ec2b3bb8f3f391de37338ffe2ccdbed 100644 (file)
--- a/src/math/interaction.c
+++ b/src/math/interaction.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012 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
@@ -42,7 +42,6 @@
 */
 
 
-
 struct interaction *
 interaction_create (const struct variable *v)
 {
@@ -57,9 +56,30 @@ interaction_create (const struct variable *v)
   return i;
 }
 
+/* Deep copy an interaction */
+struct interaction *
+interaction_clone (const struct interaction *iact)
+{
+  int v;
+  struct interaction  *i = xmalloc (sizeof *i);
+  i->vars = xcalloc (iact->n_vars, sizeof *i->vars);
+  i->n_vars = iact->n_vars;
+
+  for (v = 0; v < iact->n_vars; ++v)
+    {
+      i->vars[v] = iact->vars[v];
+    }
+
+  return i;
+}
+
+
 void
 interaction_destroy (struct interaction *i)
 {
+  if (NULL == i)
+    return;
+
   free (i->vars);
   free (i);
 }
@@ -143,6 +163,8 @@ void
 interaction_to_string (const struct interaction *iact, struct string *str)
 {
   int v = 0;
+  if ( iact->n_vars == 0)
+    return;
   ds_put_cstr (str, var_to_string (iact->vars[v]));
   for (v = 1; v < iact->n_vars; ++v)
     {
@@ -152,10 +174,10 @@ interaction_to_string (const struct interaction *iact, struct string *str)
 }
 
 unsigned int
-interaction_case_hash (const struct interaction *iact, const struct ccase *c)
+interaction_case_hash (const struct interaction *iact, const struct ccase *c, unsigned int base)
 {
   int i;
-  size_t hash = 0;
+  size_t hash = base;
   for (i = 0; i < iact->n_vars; ++i)
     {
       const struct variable *var = iact->vars[i];