Don't crash if all categorical variables are empty

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

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index 4b5176322f798212073ffc6fab95e312789acf92..b1f0ce84d9a397bdca0c71062dab79988d9eef0f 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -74,6 +74,9 @@ struct categoricals
   size_t n_cats_total;
 
   struct pool *pool;
+
+  /* Missing values to be excluded */
+  enum mv_class exclude;
 };
 
 
@@ -98,13 +101,10 @@ categoricals_dump (const struct categoricals *cat)
     {
       const struct var_params *vp = &cat->vp[v];
       const struct hmap *m = &vp->map;
-      //      size_t width = var_get_width (vp->var);
       struct hmap_node *node ;
       int x;
      
-      printf ("\n%s (%d)  CC=%g:\n", var_get_name (vp->var), vp->base_subscript, vp->cc);
-
-      assert (vp->reverse_value_map);
+      printf ("\n%s (%d)  CC=%g n_cats=%d:\n", var_get_name (vp->var), vp->base_subscript, vp->cc, vp->n_cats);
 
       printf ("Reverse map\n");
       for (x = 0 ; x < vp->n_cats; ++x)
@@ -155,7 +155,8 @@ lookup_value (const struct hmap *map, const struct variable *var, const union va
 
 
 struct categoricals *
-categoricals_create (const struct variable **v, size_t n_vars, const struct variable *wv)
+categoricals_create (const struct variable **v, size_t n_vars,
+                    const struct variable *wv, enum mv_class exclude)
 {
   size_t i;
   struct categoricals *cat = xmalloc (sizeof *cat);
@@ -165,6 +166,7 @@ categoricals_create (const struct variable **v, size_t n_vars, const struct vari
   cat->n_cats_total = 0;
   cat->reverse_variable_map = NULL;
   cat->pool = pool_create ();
+  cat->exclude = exclude;
 
   cat->vp = pool_calloc (cat->pool, n_vars, sizeof *cat->vp);
 
@@ -193,10 +195,14 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
       const struct variable *var = cat->vp[i].var;
       unsigned int width = var_get_width (var);
       const union value *val = case_data (c, var);
-      size_t hash = value_hash (val, width, 0);
+      size_t hash;
+      struct value_node *node ;
 
-      struct value_node  *node = lookup_value (&cat->vp[i].map, var, val);
+      if ( var_is_value_missing (var, val, cat->exclude))
+       continue;
 
+      hash = value_hash (val, width, 0);
+      node = lookup_value (&cat->vp[i].map, var, val);
 
       if ( NULL == node)
        {
@@ -207,7 +213,7 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
          node->cc = 0.0;
 
          hmap_insert (&cat->vp[i].map, &node->node,  hash);
-         cat->n_cats_total ++;
+         cat->n_cats_total++;
          node->subscript = cat->vp[i].n_cats++ ;
        }
 
@@ -310,6 +316,26 @@ categoricals_get_value_by_subscript (const struct categoricals *cat, int subscri
 }
 
 
+double
+categoricals_get_weight_by_subscript (const struct categoricals *cat, int subscript)
+{
+  int vindex = cat->reverse_variable_map[subscript];
+  const struct var_params *vp = &cat->vp[vindex];
+
+  return vp->cc;
+}
+
+double
+categoricals_get_sum_by_subscript (const struct categoricals *cat, int subscript)
+{
+  int vindex = cat->reverse_variable_map[subscript];
+  const struct var_params *vp = &cat->vp[vindex];
+
+  const struct value_node *vn = vp->reverse_value_map [subscript - vp->base_subscript];
+  return vn->cc;
+}
+
+
 /* Returns unity if the value in case C at SUBSCRIPT is equal to the category
    for that subscript */
 double