Move call to categoricals_done earlier in the covariance code

diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c
index 8e3b07f458d45cc0edcd7aaa4444669cfca4f8b1..1eaf1a988a335264a5db70d9cd3bc137363c7602 100644 (file)
--- a/src/language/stats/glm.c
+++ b/src/language/stats/glm.c
@@ -427,8 +427,6 @@ run_glm (struct glm_spec *cmd, struct casereader *input,
     }
   casereader_destroy (reader);
 
-  categoricals_done (ws.cats);
-
   for (reader = input;
        (c = casereader_read (reader)) != NULL; case_unref (c))
     {

diff --git a/src/math/covariance.c b/src/math/covariance.c
index b37da3d22930732878dae815c4435efaad8edbe1..f64e89d1eb2ffbee673c2179e6d2e48b78d066f3 100644 (file)
--- a/src/math/covariance.c
+++ b/src/math/covariance.c
@@ -347,6 +347,9 @@ covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c)
       assert (cov->state == 1);
       cov->state = 2;
 
+      if (cov->categoricals)
+       categoricals_done (cov->categoricals);
+
       cov->dim = cov->n_vars;
       
       if (cov->categoricals)
@@ -362,9 +365,6 @@ covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c)
          cov->moments[i] = resize_matrix (cov->moments[i], cov->dim);
        }
 
-      //      if (cov->categoricals)
-      //       categoricals_done (cov->categoricals);
-
       /* Populate the moments matrices with the categorical value elements */
       for (i = cov->n_vars; i < cov->dim; ++i)
        {