X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Foneway.q;h=c63dc3a797103d2bf037fa00cfb74b76b1991b30;hb=3b76a8aa4e808b2e6bdb792c369fda72a61304de;hp=9b5ed83dc3ca400b4cea8e539f5b780993ae8925;hpb=338fb2a2e84df6427a2fdee6769421f57d5666d8;p=pspp-builds.git

diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q
index 9b5ed83d..c63dc3a7 100644
--- a/src/language/stats/oneway.q
+++ b/src/language/stats/oneway.q
@@ -1,7 +1,6 @@
 /* PSPP - One way ANOVA. -*-c-*-
 
-Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-Author: John Darrington 2004
+Copyright (C) 1997-9, 2000, 2007 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
@@ -880,6 +879,12 @@ precalc ( struct cmd_oneway *cmd UNUSED )
     }
 }
 
+static void
+free_value (void *value_, const void *aux UNUSED) 
+{
+  union value *value = value_;
+  free (value);
+}
 
 static bool
 run_oneway(const struct ccase *first, const struct casefile *cf, 
@@ -896,12 +901,13 @@ run_oneway(const struct ccase *first, const struct casefile *cf,
   global_group_hash = hsh_create(4, 
 				 (hsh_compare_func *) compare_values,
 				 (hsh_hash_func *) hash_value,
-				 0,
+				 free_value,
 				 (void *) var_get_width (indep_var) );
 
   precalc(cmd);
 
-  filter = casefilter_create ( (cmd->incl != ONEWAY_INCLUDE), 
+  filter = casefilter_create ( (cmd->incl != ONEWAY_INCLUDE
+                                ? MV_ANY : MV_SYSTEM), 
 			       vars, n_vars );
 
   for(r = casefile_get_reader (cf, filter);
@@ -912,13 +918,17 @@ run_oneway(const struct ccase *first, const struct casefile *cf,
 
       const double weight = 
 	dict_get_case_weight (dataset_dict (ds), &c, &bad_weight_warn);
-      
-      const union value *indep_val;
 
+      const union value *indep_val;
+      void **p;
+      
       if ( casefilter_variable_missing (filter, &c, indep_var))
 	continue;
 
       indep_val = case_data (&c, indep_var);
+      p = hsh_probe (global_group_hash, indep_val);
+      if (*p == NULL)
+        *p = value_dup (indep_val, var_get_width (indep_var));
 	  
       hsh_insert ( global_group_hash, (void *) indep_val );