X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.c;h=81c673b3fc590e02cdd522e192b1b85326a06ff8;hb=089161cdd3775ea7fbcad894f4957e98ec120de5;hp=22d806b347a1d4fd85c725a3b0fe6dd5d3aaa707;hpb=15aae7ade3a0835939d28d78f20ed1eb85500d86;p=pspp

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index 22d806b347..81c673b3fc 100644
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -38,7 +38,6 @@ struct value_node
 
   union value val;            /* The value */
 
-  void *user_data;            /* A pointer to data which the caller can store stuff */
 };
 
 struct interaction_value
@@ -49,6 +48,8 @@ struct interaction_value
 
   /* Total of the weights of cases matching this interaction */
   double cc; 
+
+  void *user_data;            /* A pointer to data which the caller can store stuff */
 };
 
 static struct value_node *
@@ -72,6 +73,7 @@ struct variable_node
   struct hmap valmap;         /* A map of value nodes */
 };
 
+#if 0
 static void
 dump_interaction (const struct interaction *iact)
 {
@@ -80,6 +82,7 @@ dump_interaction (const struct interaction *iact)
   printf ("Interaction: %s\n", ds_cstr (&str));
   ds_destroy (&str);
 }
+#endif
 
 
 static struct variable_node *
@@ -121,18 +124,17 @@ struct interact_params
 };
 
 
-#if 0
 /* Comparison function to sort the reverse_value_map in ascending order */
 static int
-compare_value_node (const void *vn1_, const void *vn2_, const void *aux)
+compare_interaction_value_3way (const void *vn1_, const void *vn2_, const void *aux)
 {
-  const struct value_node * const *vn1 = vn1_;
-  const struct value_node * const *vn2 = vn2_;
-  const struct interact_params *vp = aux;
+  const struct interaction_value *const *vn1p = vn1_;
+  const struct interaction_value *const *vn2p = vn2_;
+
+  const struct interact_params *iap = aux;
 
-  return interaction_case_cmp_3way (vp->iact, (*vn1)->ccase, (*vn2)->ccase);
+  return interaction_case_cmp_3way (iap->iact, (*vn1p)->ccase, (*vn2p)->ccase);
 }
-#endif
 
 struct categoricals
 {
@@ -180,12 +182,12 @@ struct categoricals
   void *aux2;
 };
 
-
+#if 0
 static void
 categoricals_dump (const struct categoricals *cat)
 {
   int i;
-#if 1
+
   printf ("Reverse Variable Map (short):\n");
   for (i = 0; i < cat->df_sum; ++i)
     {
@@ -193,6 +195,14 @@ categoricals_dump (const struct categoricals *cat)
     }
   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)
     {
@@ -229,13 +239,37 @@ categoricals_dump (const struct categoricals *cat)
 	}
       printf (")\n");
     }
-#endif
 }
-
+#endif
 
 void
 categoricals_destroy (struct categoricals *cat)
 {
+  struct variable_node *vn = NULL;
+  int i;
+  if (NULL == cat)
+    return;
+  for (i = 0; i < cat->n_iap; ++i)
+    {
+      struct interaction_value *iv = NULL;
+      /* Interate over each interaction value, and unref any cases that we reffed */
+      HMAP_FOR_EACH (iv, struct interaction_value, node, &cat->iap[i].ivmap)
+	{
+	  case_unref (iv->ccase);
+	}
+      hmap_destroy (&cat->iap[i].ivmap);
+    }
+
+  /* Interate over each variable and delete its value map */
+  HMAP_FOR_EACH (vn, struct variable_node, node, &cat->varmap)
+    {
+      hmap_destroy (&vn->valmap);
+    }
+
+  hmap_destroy (&cat->varmap);
+
+  pool_destroy (cat->pool);
+
   free (cat);
 }
 
@@ -245,7 +279,7 @@ static struct interaction_value *
 lookup_case (const struct hmap *map, const struct interaction *iact, const struct ccase *c)
 {
   struct interaction_value *iv = NULL;
-  size_t hash = interaction_case_hash (iact, c);
+  size_t hash = interaction_case_hash (iact, c, 0);
 
   HMAP_FOR_EACH_WITH_HASH (iv, struct interaction_value, node, hash, map)
     {
@@ -341,7 +375,6 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
 	}
     }	  
   
-
   for (i = 0 ; i < cat->n_iap; ++i)
     {
       const struct interaction *iact = cat->iap[i].iact;
@@ -349,7 +382,7 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
       //      if ( interaction_case_is_missing (iact, c, cat->exclude))
       //         continue;
 
-      size_t hash = interaction_case_hash (iact, c);
+      size_t hash = interaction_case_hash (iact, c, 0);
       struct interaction_value *node = lookup_case (&cat->iap[i].ivmap, iact, c);
 
       if ( NULL == node)
@@ -361,8 +394,8 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
 
 	  hmap_insert (&cat->iap[i].ivmap, &node->node, hash);
 
-	  //	  if (cat->user_data_create)
-	  //       node->user_data = cat->user_data_create (cat->aux1, cat->aux2);
+	  if (cat->user_data_create)
+	    node->user_data = cat->user_data_create (cat->aux1, cat->aux2);
 	}
       else
 	{
@@ -370,9 +403,8 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
 	}
       cat->iap[i].cc += weight;
 
-      //      if (cat->update)
-      //	cat->update (node->user_data, cat->exclude, cat->wv, NULL, c, cat->aux1, cat->aux2);
-
+      if (cat->update)
+      	cat->update (node->user_data, cat->exclude, cat->wv, NULL, c, cat->aux1, cat->aux2);
     }
 }
 
@@ -395,6 +427,8 @@ categoricals_df (const struct categoricals *cat, size_t n)
 size_t
 categoricals_n_total (const struct categoricals *cat)
 {
+  assert (cat->reverse_variable_map_long);
+
   return cat->n_cats_total;
 }
 
@@ -472,11 +506,15 @@ categoricals_done (const struct categoricals *cat_)
 	  iap->reverse_interaction_value_map[x++] = ivn;
 	}
 
-#if 0
+      assert (x <= iap->n_cats);
+
       /* For some purposes (eg CONTRASTS in ONEWAY) the values need to be sorted */
-      sort (vp->reverse_interaction_value_map, vp->n_cats, sizeof (const struct interaction_value *),
-	    compare_value_node, vp);
-#endif
+      sort (iap->reverse_interaction_value_map, x, sizeof (*iap->reverse_interaction_value_map),
+	    compare_interaction_value_3way, iap);
+
+      /* Fill the remaining values with null */
+      for (ii = x ; ii < iap->n_cats; ++ii)
+	iap->reverse_interaction_value_map[ii] = NULL;
 
       /* Populate the reverse variable maps. */
       for (ii = 0; ii < iap->df; ++ii)
@@ -487,6 +525,8 @@ categoricals_done (const struct categoricals *cat_)
     }
 
   assert (cat->n_vars <= cat->n_iap);
+
+  //  categoricals_dump (cat);
 }
 
 
@@ -503,7 +543,6 @@ reverse_variable_lookup_short (const struct categoricals *cat, int subscript)
 static int
 reverse_variable_lookup_long (const struct categoricals *cat, int subscript)
 {
-  printf ("%s\n", __FUNCTION__);
   assert (cat->reverse_variable_map_long);
   assert (subscript >= 0);
   assert (subscript < cat->n_cats_total);
@@ -529,6 +568,10 @@ categoricals_get_case_by_subscript (const struct categoricals *cat, int subscrip
   int vindex = reverse_variable_lookup_short (cat, subscript);
   const struct interact_params *vp = &cat->iap[vindex];
   const struct interaction_value *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_short];
+
+  if ( vn == NULL)
+    return NULL;
+
   return vn->ccase;
 }
 
@@ -550,6 +593,9 @@ categoricals_get_sum_by_subscript (const struct categoricals *cat, int subscript
 
   const struct interaction_value *iv = vp->reverse_interaction_value_map [subscript - vp->base_subscript_short];
 
+  if (iv == NULL)
+    return 0;
+
   return iv->cc;
 }
 
@@ -563,6 +609,9 @@ categoricals_get_binary_by_subscript (const struct categoricals *cat, int subscr
 
   const struct ccase *c2 =  categoricals_get_case_by_subscript (cat, subscript);
 
+  if ( c2 == NULL)
+    return 0;
+
   return interaction_case_equal (iact, c, c2);
 }
 
@@ -574,18 +623,15 @@ categoricals_get_n_variables (const struct categoricals *cat)
   return cat->n_vars;
 }
 
-
-
 /* Return a case containing the set of values corresponding to SUBSCRIPT */
 const struct ccase *
 categoricals_get_case_by_category (const struct categoricals *cat, int subscript)
 {
   int vindex = reverse_variable_lookup_long (cat, subscript);
   const struct interact_params *vp = &cat->iap[vindex];
-  //  const struct interaction_value *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
+  const struct interaction_value *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
 
-  //  return vn->ccase;
-  return NULL;
+  return vn->ccase;
 }
 
 void *
@@ -594,8 +640,6 @@ categoricals_get_user_data_by_category (const struct categoricals *cat, int subs
   int vindex = reverse_variable_lookup_long (cat, subscript);
   const struct interact_params *vp = &cat->iap[vindex];
 
-  //const struct value_node *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
-  //return vn->user_data;
-  assert (0);
-  return NULL;
+  const struct interaction_value *iv = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
+  return iv->user_data;
 }