X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Finteraction.h;h=8229083f860f7cf0a7b86e5f4268b9a1551623cf;hb=0c5a40350a72440f1745f70c5bd15d4b87d2238f;hp=bffe7518f5d6014d40d86de503554c8d313ebb92;hpb=e3fa2fade9820dcb3c7ee3883839f8848d248559;p=pspp

diff --git a/src/math/interaction.h b/src/math/interaction.h
index bffe7518f5..8229083f86 100644
--- a/src/math/interaction.h
+++ b/src/math/interaction.h
@@ -19,32 +19,55 @@
 #define _INTERACTION_H__ 1
 
 #include <stdbool.h>
+#include "libpspp/compiler.h"
 #include "data/missing-values.h"
 
+struct ccase;
 struct interaction;
-struct variable;
 struct string;
+struct variable;
 
 #include <stddef.h>
-struct interaction
-{
-  size_t n_vars;
-  const struct variable **vars;
-};
 
+/* An interaction is a structure containing a "product" of other variables.
+   The variables can be either string or numeric.
 
+   Interaction is commutative.  That means, that from a mathematical point of
+   view, the order of the variables is irrelevant.  However, for display
+   purposes, and for matching with an interaction's value the order is
+   pertinent.  Therefore, when using these functions, make sure the orders of
+   variables and values match when appropriate.
 
-struct interaction * interaction_create (const struct variable *);
+   Some functions for interactions will not work properly for interactions that
+   contain a given variable more than once, so this should be regarded as an
+   invariant.  The functions to modify interactions don't check for this
+   invariant. */
+struct interaction
+  {
+    const struct variable **vars;
+    size_t n_vars;
+  };
+
+struct interaction *interaction_create (const struct variable *);
+struct interaction *interaction_clone (const struct interaction *);
 void interaction_destroy (struct interaction *);
 void interaction_add_variable (struct interaction *, const struct variable *);
 void interaction_dump (const struct interaction *);
-void interaction_to_string (const struct interaction *iact, struct string *str);
-
+void interaction_to_string (const struct interaction *, struct string *str);
+bool interaction_is_proper_subset (const struct interaction *,
+                                   const struct interaction *);
+bool interaction_is_subset (const struct interaction *,
+                            const struct interaction *);
 
-union value;
 
-unsigned int interaction_value_hash (const struct interaction *, const union value *);
-bool interaction_value_equal (const struct interaction *, const union value *, const union value *);
-bool interaction_value_is_missing (const struct interaction *, const union value *, enum mv_class);
+unsigned int interaction_case_hash (const struct interaction *,
+                                    const struct ccase *,
+				    unsigned int base) WARN_UNUSED_RESULT;
+bool interaction_case_equal (const struct interaction *, const struct ccase *,
+                             const struct ccase *);
+bool interaction_case_is_missing (const struct interaction *,
+                                  const struct ccase *, enum mv_class);
+int interaction_case_cmp_3way (const struct interaction *,
+                               const struct ccase *, const struct ccase *);
 
 #endif