ONEWAY: call categoricals_done only once

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index dba2d35bb2ee353fdced3fbad494753aa9fb2ed7..4fd027e2995115d12862221160eea15791fb76a1 100644 (file)
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -800,7 +800,7 @@ run_oneway (const struct oneway_spec *cmd,
       gsl_matrix *cm;
       struct per_var_ws *pvw = &ws.vws[v];
       const struct categoricals *cats = covariance_get_categoricals (pvw->cov);
-      const bool ok = categoricals_done (cats);
+      const bool ok = categoricals_sane (cats);
 
       if ( ! ok)
        {

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index 586037b585c3a7d91aabf94da12e61a35d0ad8dc..ba88227864c5fc363a02b921125f44a3d7c2243e 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -174,6 +174,8 @@ struct categoricals
   const void *aux1;
   void *aux2;
 
+  bool sane;
+
   const struct payload *payload;
 };
 
@@ -296,6 +298,11 @@ lookup_case (const struct hmap *map, const struct interaction *iact, const struc
   return iv;
 }
 
+bool 
+categoricals_sane (const struct categoricals *cat)
+{
+  return cat->sane;
+}
 
 struct categoricals *
 categoricals_create (struct interaction *const*inter, size_t n_inter,
@@ -315,6 +322,7 @@ categoricals_create (struct interaction *const*inter, size_t n_inter,
   cat->fctr_excl = fctr_excl;
   cat->payload = NULL;
   cat->aux2 = NULL;
+  cat->sane = false;
 
   cat->iap = pool_calloc (cat->pool, cat->n_iap, sizeof *cat->iap);
 
@@ -459,7 +467,7 @@ categoricals_is_complete (const struct categoricals *cat)
 
 /* This function must be called *before* any call to categoricals_get_*_by subscript and
  *after* all calls to categoricals_update */
-bool
+void
 categoricals_done (const struct categoricals *cat_)
 {
   /* Implementation Note: Whilst this function is O(n) in cat->n_cats_total, in most
@@ -493,7 +501,10 @@ categoricals_done (const struct categoricals *cat_)
          struct variable_node *vn = lookup_variable (&cat->varmap, var, hash_pointer (var, 0));
 
          if  (hmap_count (&vn->valmap) == 0)
-           return false;
+           {
+             cat->sane = false;
+             return;
+           }
 
          cat->iap[i].df_prod[v] = df * (hmap_count (&vn->valmap) - 1);
          df = cat->iap[i].df_prod[v];
@@ -585,7 +596,7 @@ categoricals_done (const struct categoricals *cat_)
        }
     }
 
-  return true;
+  cat->sane = true;
 }
 
 

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index b2f6b649b1b1d0d67b656e87fccec70802b8861a..28e0f5f1df98fc422d2fbae13296c4003f794cdf 100644 (file)
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -57,7 +57,6 @@ size_t categoricals_df_total (const struct categoricals *cat);
 */
 size_t categoricals_get_n_variables (const struct categoricals *cat);
 
-
 bool categoricals_is_complete (const struct categoricals *cat);
 
 
@@ -67,7 +66,9 @@ bool categoricals_is_complete (const struct categoricals *cat);
   If this function returns false, then no calls to _by_subscript or *_by_category
   are allowed.
 */
-bool categoricals_done (const struct categoricals *cat);
+void categoricals_done (const struct categoricals *cat);
+
+bool categoricals_sane (const struct categoricals *cat);
 
 
 /*