From 59c87092f400493fbc95ee72e5cd8bf02468ce01 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 3 Aug 2012 21:35:11 +0200 Subject: [PATCH] Make categoricals own its interactions --- src/language/stats/examine.c | 4 +--- src/language/stats/glm.c | 2 -- src/math/categoricals.c | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c index 3288f5bd11..fc67ffaf2a 100644 --- a/src/language/stats/examine.c +++ b/src/language/stats/examine.c @@ -2236,6 +2236,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) { examine.n_iacts--; examine.iacts = &iacts_mem[1]; + interaction_destroy (iacts_mem[0]); } @@ -2291,9 +2292,6 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) caseproto_unref (examine.ex_proto); - for (i = 0; i < examine.n_iacts; ++i) - interaction_destroy (examine.iacts[i]); - free (examine.ptiles); free (examine.dep_vars); pool_destroy (examine.pool); diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c index 82f1db7254..6e4d31c4de 100644 --- a/src/language/stats/glm.c +++ b/src/language/stats/glm.c @@ -324,8 +324,6 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) const_var_set_destroy (factors); free (glm.factor_vars); - for (i = 0 ; i < glm.n_interactions; ++i) - interaction_destroy (glm.interactions[i]); free (glm.interactions); free (glm.dep_vars); diff --git a/src/math/categoricals.c b/src/math/categoricals.c index a7cf3a1146..586037b585 100644 --- a/src/math/categoricals.c +++ b/src/math/categoricals.c @@ -261,6 +261,7 @@ categoricals_destroy (struct categoricals *cat) free (cat->iap[i].enc_sum); free (cat->iap[i].df_prod); hmap_destroy (&cat->iap[i].ivmap); + interaction_destroy (cat->iap[i].iact); } /* Interate over each variable and delete its value map */ -- 2.30.2