X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Foneway.c;h=a30026e8b4c38c283fcc74a7524fdec9d8caed3b;hb=c91f650b47f33cfbd4b7ed45dbfa7eb012c7e6fb;hp=4ac917bd5d883a2a20561a2ddd53e4f77d31aae5;hpb=1127c2b14706999bc409c8c88f3c6c33c8423673;p=pspp

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index 4ac917bd5d..a30026e8b4 100644
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -52,6 +52,7 @@
 /* Workspace variable for each dependent variable */
 struct per_var_ws
 {
+  struct interaction *iact;
   struct categoricals *cat;
   struct covariance *cov;
   struct levene *nl;
@@ -384,6 +385,22 @@ static void show_homogeneity (const struct oneway_spec *, const struct oneway_wo
 static void output_oneway (const struct oneway_spec *, struct oneway_workspace *ws);
 static void run_oneway (const struct oneway_spec *cmd, struct casereader *input, const struct dataset *ds);
 
+
+static void
+destroy_coeff_list (struct contrasts_node *coeff_list)
+{
+  struct coeff_node *cn = NULL;
+  struct coeff_node *cnx = NULL;
+  struct ll_list *cl = &coeff_list->coefficient_list;
+  
+  ll_for_each_safe (cn, cnx, struct coeff_node, ll, cl)
+    {
+      free (cn);
+    }
+  
+  free (coeff_list);
+}
+
 static void
 oneway_cleanup (struct oneway_spec *cmd)
 {
@@ -391,17 +408,10 @@ oneway_cleanup (struct oneway_spec *cmd)
   struct contrasts_node *coeff_next  = NULL;
   ll_for_each_safe (coeff_list, coeff_next, struct contrasts_node, ll, &cmd->contrast_list)
     {
-      struct coeff_node *cn = NULL;
-      struct coeff_node *cnx = NULL;
-      struct ll_list *cl = &coeff_list->coefficient_list;
-
-      ll_for_each_safe (cn, cnx, struct coeff_node, ll, cl)
-	{
-	  free (cn);
-	}
-
-      free (coeff_list);
+      destroy_coeff_list (coeff_list);
     }
+
+  free (cmd->posthoc);
 }
 
 
@@ -527,6 +537,7 @@ cmd_oneway (struct lexer *lexer, struct dataset *ds)
 		}
 	      else
 		{
+		  destroy_coeff_list (cl);
 		  lex_error (lexer, NULL);
 		  goto error;
 		}
@@ -626,6 +637,15 @@ makeit (const void *aux1, void *aux2 UNUSED)
   return dd;
 }
 
+static void 
+killit (const void *aux1 UNUSED, void *aux2 UNUSED, void *user_data)
+{
+  struct descriptive_data *dd = user_data;
+
+  dd_destroy (dd);
+}
+
+
 static void 
 updateit (const void *aux1, void *aux2, void *user_data,
 	  const struct ccase *c, double weight)
@@ -683,14 +703,14 @@ run_oneway (const struct oneway_spec *cmd,
 
   for (v = 0; v < cmd->n_vars; ++v)
     {
-      struct interaction *inter = interaction_create (cmd->indep_var);
-
       struct payload payload;
       payload.create = makeit;
       payload.update = updateit;
-      payload.destroy = NULL;
+      payload.calculate = NULL;
+      payload.destroy = killit;
 
-      ws.vws[v].cat = categoricals_create (&inter, 1, cmd->wv,
+      ws.vws[v].iact = interaction_create (cmd->indep_var);
+      ws.vws[v].cat = categoricals_create (&ws.vws[v].iact, 1, cmd->wv,
                                            cmd->exclude, cmd->exclude);
 
       categoricals_set_payload (ws.vws[v].cat, &payload, 
@@ -798,7 +818,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)
 	{
@@ -854,7 +874,9 @@ run_oneway (const struct oneway_spec *cmd,
       covariance_destroy (ws.vws[v].cov);
       levene_destroy (ws.vws[v].nl);
       dd_destroy (ws.dd_total[v]);
+      interaction_destroy (ws.vws[v].iact);
     }
+
   free (ws.vws);
   free (ws.dd_total);
 }
@@ -885,6 +907,7 @@ output_oneway (const struct oneway_spec *cmd, struct oneway_workspace *ws)
 	       i, ll_count (cl), ws->actual_number_of_groups);
 
 	  ll_remove (&coeff_list->ll);
+	  destroy_coeff_list (coeff_list);
 	  continue;
 	}
 
@@ -1548,7 +1571,7 @@ show_comparisons (const struct oneway_spec *cmd, const struct oneway_workspace *
 
   tab_vline (t, TAL_2, heading_cols, 0, n_rows - 1);
 
-  tab_title (t, _("Multiple Comparisons"));
+  tab_title (t, _("Multiple Comparisons (%s)"), var_to_string (cmd->vars[v]));
 
   tab_text_format (t,  1, 1, TAB_LEFT | TAT_TITLE, _("(I) %s"), var_to_string (cmd->indep_var));
   tab_text_format (t,  2, 1, TAB_LEFT | TAT_TITLE, _("(J) %s"), var_to_string (cmd->indep_var));