X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.c;h=a7cf3a114624d4de3a9ea5d184a516b85a1700fa;hb=23c5ab34eec1b2c2fef34155620c7cab670175f0;hp=0baf5f1ff4446c3867a9daff3aa70df5b4c86844;hpb=320480cba250c94eb108b0cb2236b9a6ff3b8ca2;p=pspp

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index 0baf5f1ff4..a7cf3a1146 100644
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -32,6 +32,8 @@
 
 #include "gl/xalloc.h"
 
+#define CATEGORICALS_DEBUG 0
+
 #define EFFECTS_CODING 1
 
 struct value_node
@@ -76,17 +78,6 @@ struct variable_node
   int n_vals;                 /* Number of values for this variable */
 };
 
-#if 0
-static void
-dump_interaction (const struct interaction *iact)
-{
-  struct string str = DS_EMPTY_INITIALIZER;
-  interaction_to_string (iact, &str);
-  printf ("Interaction: %s\n", ds_cstr (&str));
-  ds_destroy (&str);
-}
-#endif
-
 static struct variable_node *
 lookup_variable (const struct hmap *map, const struct variable *var, unsigned int hash)
 {
@@ -174,8 +165,11 @@ struct categoricals
 
   struct pool *pool;
 
-  /* Missing values to be excluded */
-  enum mv_class exclude;
+  /* Missing values in the dependent varirable to be excluded */
+  enum mv_class dep_excl;
+
+  /* Missing values in the factor variables to be excluded */
+  enum mv_class fctr_excl;
 
   const void *aux1;
   void *aux2;
@@ -183,65 +177,66 @@ struct categoricals
   const struct payload *payload;
 };
 
-#if 0
 static void
 categoricals_dump (const struct categoricals *cat)
 {
-  int i;
-
-  printf ("Reverse Variable Map (short):\n");
-  for (i = 0; i < cat->df_sum; ++i)
+  if (CATEGORICALS_DEBUG)
     {
-      printf (" %d", cat->reverse_variable_map_short[i]);
-    }
-  printf ("\n");
+      int i;
 
-  printf ("Reverse Variable Map (long):\n");
-  for (i = 0; i < cat->n_cats_total; ++i)
-    {
-      printf (" %d", cat->reverse_variable_map_long[i]);
-    }
-  printf ("\n");
+      printf ("Reverse Variable Map (short):\n");
+      for (i = 0; i < cat->df_sum; ++i)
+	{
+	  printf (" %d", cat->reverse_variable_map_short[i]);
+	}
+      printf ("\n");
+
+      printf ("Reverse Variable Map (long):\n");
+      for (i = 0; i < cat->n_cats_total; ++i)
+	{
+	  printf (" %d", cat->reverse_variable_map_long[i]);
+	}
+      printf ("\n");
 
 
-  printf ("Number of interactions %d\n", cat->n_iap);
-  for (i = 0 ; i < cat->n_iap; ++i)
-    {
-      int v;
-      struct string str;
-      const struct interact_params *iap = &cat->iap[i];
-      const struct interaction *iact = iap->iact;
+      printf ("Number of interactions %d\n", cat->n_iap);
+      for (i = 0 ; i < cat->n_iap; ++i)
+	{
+	  int v;
+	  struct string str;
+	  const struct interact_params *iap = &cat->iap[i];
+	  const struct interaction *iact = iap->iact;
 
-      ds_init_empty (&str);
-      interaction_to_string (iact, &str);
+	  ds_init_empty (&str);
+	  interaction_to_string (iact, &str);
 
-      printf ("\nInteraction: %s (n: %d); ", ds_cstr (&str), iap->n_cats);
-      ds_destroy (&str);
-      printf ("Base subscript: %d\n", iap->base_subscript_short);
+	  printf ("\nInteraction: %s (n: %d); ", ds_cstr (&str), iap->n_cats);
+	  ds_destroy (&str);
+	  printf ("Base subscript: %d\n", iap->base_subscript_short);
 
-      printf ("\t(");
-      for (v = 0; v < hmap_count (&iap->ivmap); ++v)
-	{
-	  int vv;
-	  const struct interaction_value *iv = iap->reverse_interaction_value_map[v];
-	  
-	  if (v > 0)  printf ("   ");
-	  printf ("{");
-	  for (vv = 0; vv < iact->n_vars; ++vv)
+	  printf ("\t(");
+	  for (v = 0; v < hmap_count (&iap->ivmap); ++v)
 	    {
-	      const struct variable *var = iact->vars[vv];
-	      const union value *val = case_data (iv->ccase, var);
+	      int vv;
+	      const struct interaction_value *iv = iap->reverse_interaction_value_map[v];
+	  
+	      if (v > 0)  printf ("   ");
+	      printf ("{");
+	      for (vv = 0; vv < iact->n_vars; ++vv)
+		{
+		  const struct variable *var = iact->vars[vv];
+		  const union value *val = case_data (iv->ccase, var);
 	      
-	      printf ("%g", val->f);
-	      if (vv < iact->n_vars - 1)
-		printf (", ");
+		  printf ("%g", val->f);
+		  if (vv < iact->n_vars - 1)
+		    printf (", ");
+		}
+	      printf ("}");
 	    }
-	  printf ("}");
+	  printf (")\n");
 	}
-      printf (")\n");
     }
 }
-#endif
 
 void
 categoricals_destroy (struct categoricals *cat)
@@ -303,7 +298,7 @@ lookup_case (const struct hmap *map, const struct interaction *iact, const struc
 
 struct categoricals *
 categoricals_create (struct interaction *const*inter, size_t n_inter,
-		     const struct variable *wv, enum mv_class exclude)
+		     const struct variable *wv, enum mv_class dep_excl, enum mv_class fctr_excl)
 {
   size_t i;
   struct categoricals *cat = xmalloc (sizeof *cat);
@@ -315,7 +310,8 @@ categoricals_create (struct interaction *const*inter, size_t n_inter,
   cat->reverse_variable_map_short = NULL;
   cat->reverse_variable_map_long = NULL;
   cat->pool = pool_create ();
-  cat->exclude = exclude;
+  cat->dep_excl = dep_excl;
+  cat->fctr_excl = fctr_excl;
   cat->payload = NULL;
   cat->aux2 = NULL;
 
@@ -386,7 +382,7 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
       size_t hash;
       struct interaction_value *node;
 
-      if ( interaction_case_is_missing (iact, c, cat->exclude))
+      if ( interaction_case_is_missing (iact, c, cat->fctr_excl))
 	continue;
 
       hash = interaction_case_hash (iact, c, 0);
@@ -536,6 +532,7 @@ categoricals_done (const struct categoricals *cat_)
       HMAP_FOR_EACH (ivn, struct interaction_value, node, &iap->ivmap)
 	{
 	  iap->reverse_interaction_value_map[x++] = ivn;
+
 	}
 
       assert (x <= iap->n_cats);
@@ -561,7 +558,7 @@ categoricals_done (const struct categoricals *cat_)
 
   assert (cat->n_vars <= cat->n_iap);
 
-  //  categoricals_dump (cat);
+  categoricals_dump (cat);
 
   /* Tally up the sums for all the encodings */
   for (i = 0 ; i < cat->n_iap; ++i)
@@ -582,6 +579,8 @@ categoricals_done (const struct categoricals *cat_)
 	      const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
 	      iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
 	    }
+	  if (cat->payload && cat->payload->destroy)
+	    cat->payload->destroy (cat->aux1, cat->aux2, iv->user_data);
 	}
     }
 
@@ -702,8 +701,14 @@ categoricals_get_n_variables (const struct categoricals *cat)
 const struct ccase *
 categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n)
 {
+  const struct interaction_value *vn;
+
   const struct interact_params *vp = &cat->iap[iact];
-  const struct interaction_value *vn = vp->reverse_interaction_value_map [n];
+
+  if ( n >= hmap_count (&vp->ivmap))
+    return NULL;
+
+  vn = vp->reverse_interaction_value_map [n];
 
   return vn->ccase;
 }
@@ -713,7 +718,12 @@ void *
 categoricals_get_user_data_by_category_real (const struct categoricals *cat, int iact, int n)
 {
   const struct interact_params *vp = &cat->iap[iact];
-  const struct interaction_value *iv = vp->reverse_interaction_value_map [n];
+  const struct interaction_value *iv ;
+
+  if ( n >= hmap_count (&vp->ivmap))
+    return NULL;
+
+  iv = vp->reverse_interaction_value_map [n];
 
   return iv->user_data;
 }