Merge commit 'origin/stable'

[pspp-builds.git] / src / language / stats / chisquare.c

diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c
index 6287977b5abc1fb21272823e6ec5c0f4bd2fa101..4593df4116eda81be5230a64ee2eee6c5f9fa15f 100644 (file)
--- a/src/language/stats/chisquare.c
+++ b/src/language/stats/chisquare.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2009 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
@@ -58,7 +58,7 @@ create_freq_hash_with_range (const struct dictionary *dict,
 {
   bool warn = true;
   float i_d;
-  struct ccase c;
+  struct ccase *c;
 
   struct hsh_table *freq_hash =
     hsh_create (4, compare_freq, hash_freq,
@@ -68,47 +68,22 @@ create_freq_hash_with_range (const struct dictionary *dict,
   /* Populate the hash with zero entries */
   for (i_d = trunc (lo); i_d <= trunc (hi); i_d += 1.0 )
     {
-      union value the_value;
       struct freq_mutable *fr = xmalloc (sizeof (*fr));
-
-      the_value.f = i_d;
-
-      fr->value = value_dup (&the_value, 0);
+      value_init (&fr->value, 0);
+      fr->value.f = i_d;
       fr->count = 0;
-
       hsh_insert (freq_hash, fr);
     }
 
-  while (casereader_read (input, &c))
+  for (; (c = casereader_read (input)) != NULL; case_unref (c))
     {
-      union value obs_value;
-      struct freq **existing_fr;
-      struct freq *fr = xmalloc(sizeof  (*fr));
-      fr->value = case_data (&c, var);
-
-      fr->count = dict_get_case_weight (dict, &c, &warn);
-
-      obs_value.f = trunc (fr->value->f);
-
-      if ( obs_value.f < lo || obs_value.f > hi)
-       {
-         free (fr);
-         case_destroy (&c);
-         continue;
-       }
-
-      fr->value = &obs_value;
-
-      existing_fr = (struct freq **) hsh_probe (freq_hash, fr);
-
-      /* This must exist in the hash, because we previously populated it
-        with zero counts */
-      assert (*existing_fr);
-
-      (*existing_fr)->count += fr->count;
-      free (fr);
-
-      case_destroy (&c);
+      struct freq_mutable fr;
+      fr.value.f = trunc (case_num (c, var));
+      if (fr.value.f >= lo && fr.value.f <= hi)
+        {
+          struct freq_mutable *existing_fr = hsh_force_find (freq_hash, &fr);
+          existing_fr->count += dict_get_case_weight (dict, c, &warn);
+        }
     }
   if (casereader_destroy (input))
     return freq_hash;
@@ -130,33 +105,36 @@ create_freq_hash (const struct dictionary *dict,
                  struct casereader *input,
                  const struct variable *var)
 {
+  int width = var_get_width (var);
   bool warn = true;
-  struct ccase c;
+  struct ccase *c;
 
   struct hsh_table *freq_hash =
     hsh_create (4, compare_freq, hash_freq,
                free_freq_mutable_hash,
                (void *) var);
 
-  for (; casereader_read (input, &c); case_destroy (&c))
+  for (; (c = casereader_read (input)) != NULL; case_unref (c))
     {
-      struct freq **existing_fr;
-      struct freq *fr = xmalloc(sizeof  (*fr));
-      fr->value = case_data (&c, var);
+      struct freq_mutable fr;
+      void **p;
 
-      fr->count = dict_get_case_weight (dict, &c, &warn);
+      fr.value = *case_data (c, var);
+      fr.count = dict_get_case_weight (dict, c, &warn);
 
-      existing_fr = (struct freq **) hsh_probe (freq_hash, fr);
-      if ( *existing_fr)
-       {
-         (*existing_fr)->count += fr->count;
-         free (fr);
-       }
+      p = hsh_probe (freq_hash, &fr);
+      if (*p == NULL)
+        {
+          struct freq_mutable *new_fr = *p = xmalloc (sizeof *new_fr);
+          value_init (&new_fr->value, width);
+          value_copy (&new_fr->value, &fr.value, width);
+          new_fr->count = fr.count;
+        }
       else
-       {
-          *existing_fr = fr;
-          fr->value = value_dup (fr->value, var_get_width (var));
-       }
+        {
+          struct freq *existing_fr = *p;
+          existing_fr->count += fr.count;
+        }
     }
   if (casereader_destroy (input))
     return freq_hash;
@@ -202,7 +180,7 @@ create_variable_frequency_table (const struct dictionary *dict,
     }
 
   table = tab_create(4, n_cells + 2, 0);
-  tab_dim (table, tab_natural_dimensions);
+  tab_dim (table, tab_natural_dimensions, NULL);
 
   tab_title (table, var_to_string(var));
   tab_text (table, 1, 0, TAB_LEFT, _("Observed N"));
@@ -238,7 +216,7 @@ create_combo_frequency_table (const struct chisquare_test *test)
   int n_cells = test->hi - test->lo + 1;
 
   table = tab_create(1 + ost->n_vars * 4, n_cells + 3, 0);
-  tab_dim (table, tab_natural_dimensions);
+  tab_dim (table, tab_natural_dimensions, NULL);
 
   tab_title (table, _("Frequencies"));
   for ( i = 0 ; i < ost->n_vars ; ++i )
@@ -294,7 +272,7 @@ create_stats_table (const struct chisquare_test *test)
 
   struct tab_table *table;
   table = tab_create (1 + ost->n_vars, 4, 0);
-  tab_dim (table, tab_natural_dimensions);
+  tab_dim (table, tab_natural_dimensions, NULL);
   tab_title (table, _("Test Statistics"));
   tab_headers (table, 1, 0, 1, 0);
 
@@ -321,7 +299,9 @@ void
 chisquare_execute (const struct dataset *ds,
                   struct casereader *input,
                    enum mv_class exclude,
-                  const struct npar_test *test)
+                  const struct npar_test *test,
+                  bool exact UNUSED,
+                  double timer UNUSED)
 {
   const struct dictionary *dict = dataset_dict (ds);
   int v, i;
@@ -348,7 +328,8 @@ chisquare_execute (const struct dataset *ds,
          struct hsh_table *freq_hash = NULL;
           struct casereader *reader =
             casereader_create_filter_missing (casereader_clone (input),
-                                              &ost->vars[v], 1, exclude, NULL);
+                                              &ost->vars[v], 1, exclude,
+                                             NULL, NULL);
          struct tab_table *freq_table =
             create_variable_frequency_table(dict, reader, cst, v, &freq_hash);
 
@@ -368,7 +349,7 @@ chisquare_execute (const struct dataset *ds,
            {
              struct string str;
              double exp;
-             const union value *observed_value = ff[i]->value;
+             const union value *observed_value = &ff[i]->value;
 
              ds_init_empty (&str);
              var_append_value_name (ost->vars[v], observed_value, &str);
@@ -418,7 +399,8 @@ chisquare_execute (const struct dataset *ds,
          double total_obs = 0.0;
           struct casereader *reader =
             casereader_create_filter_missing (casereader_clone (input),
-                                              &ost->vars[v], 1, exclude, NULL);
+                                              &ost->vars[v], 1, exclude,
+                                             NULL, NULL);
          struct hsh_table *freq_hash =
            create_freq_hash_with_range (dict, reader,
                                          ost->vars[v], cst->lo, cst->hi);
@@ -440,7 +422,7 @@ chisquare_execute (const struct dataset *ds,
              struct string str;
              double exp;
 
-             const union value *observed_value = ff[i]->value;
+             const union value *observed_value = &ff[i]->value;
 
              ds_init_empty (&str);
              var_append_value_name (ost->vars[v], observed_value, &str);