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 19b6e3f11907dec4f8e92a43d38d1c8dc7c7182f..b1f0ce84d9a397bdca0c71062dab79988d9eef0f 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -104,9 +104,7 @@ categoricals_dump (const struct categoricals *cat)
       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)
@@ -215,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++ ;
        }
 
@@ -317,6 +315,27 @@ categoricals_get_value_by_subscript (const struct categoricals *cat, int subscri
   return &vn->value;
 }
 
+
+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