Make cases simpler, faster, and easier to understand.

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

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 1d8d15fc63a3b1d5131c8cfd5045564737f14554..15d0e4032a146c094e5275cd21f25cdfadc71afe 100644 (file)
--- a/src/language/stats/binomial.c
+++ b/src/language/stats/binomial.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 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
@@ -17,7 +17,6 @@
 #include <config.h>
 #include <libpspp/compiler.h>
 #include <output/table.h>
-#include <libpspp/alloc.h>
 
 #include <data/case.h>
 #include <data/casereader.h>
@@ -33,6 +32,8 @@
 #include "binomial.h"
 #include "freq.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -40,7 +41,6 @@
 
 #include <gsl/gsl_cdf.h>
 #include <gsl/gsl_randist.h>
-#include <gsl-extras/gsl-extras.h>
 
 #include <minmax.h>
 
@@ -78,7 +78,7 @@ calculate_binomial_internal (double n1, double n2, double p)
   /* SPSS Statistical Algorithms has completely different and WRONG
      advice here. */
 
-  double sig1tailed = gslextras_cdf_binomial_P (n1, n1 + n2, p);
+  double sig1tailed = gsl_cdf_binomial_P (n1, p, n1 + n2);
 
   if ( p == 0.5 )
     return sig1tailed > 0.5 ? 1.0 :sig1tailed * 2.0;
@@ -98,17 +98,17 @@ do_binomial (const struct dictionary *dict,
   bool warn = true;
 
   const struct one_sample_test *ost = (const struct one_sample_test *) bst;
-  struct ccase c;
+  struct ccase *c;
 
-  while (casereader_read(input, &c))
+  while ((c = casereader_read(input)) != NULL)
     {
       int v;
-      double w = dict_get_case_weight (dict, &c, &warn);
+      double w = dict_get_case_weight (dict, c, &warn);
 
       for (v = 0 ; v < ost->n_vars ; ++v )
        {
          const struct variable *var = ost->vars[v];
-         const union value *value = case_data (&c, var);
+         const union value *value = case_data (c, var);
           int width = var_get_width (var);
 
          if (var_is_value_missing (var, value, exclude))
@@ -119,20 +119,20 @@ do_binomial (const struct dictionary *dict,
              cat1[v].value = value_dup (value, width);
              cat1[v].count = w;
            }
-         else if ( 0 == compare_values (cat1[v].value, value, width))
+         else if ( 0 == compare_values_short (cat1[v].value, value, var))
            cat1[v].count += w;
          else if ( NULL == cat2[v].value )
            {
              cat2[v].value = value_dup (value, width);
              cat2[v].count = w;
            }
-         else if ( 0 == compare_values (cat2[v].value, value, width))
+         else if ( 0 == compare_values_short (cat2[v].value, value, var))
            cat2[v].count += w;
          else if ( bst->category1 == SYSMIS)
            msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
        }
 
-      case_destroy (&c);
+      case_unref (c);
     }
   return casereader_destroy (input);
 }
@@ -143,7 +143,9 @@ void
 binomial_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)
 {
   int v;
   const struct binomial_test *bst = (const struct binomial_test *) test;
@@ -184,7 +186,16 @@ binomial_execute (const struct dataset *ds,
       for (v = 0 ; v < ost->n_vars; ++v)
         {
           double n_total, sig;
+         struct string catstr1;
+         struct string catstr2;
           const struct variable *var = ost->vars[v];
+
+         ds_init_empty (&catstr1);
+         ds_init_empty (&catstr2);
+
+         var_append_value_name (var, cat1[v].value, &catstr1);
+         var_append_value_name (var, cat2[v].value, &catstr2);
+
           tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3);
 
           /* Titles */
@@ -197,10 +208,8 @@ binomial_execute (const struct dataset *ds,
           tab_float (table, 5, 1 + v * 3, TAB_NONE, bst->p, 8, 3);
 
           /* Category labels */
-          tab_text (table, 2, 1 + v * 3, TAB_NONE,
-                    var_get_value_name (var, cat1[v].value));
-          tab_text (table, 2, 2 + v * 3, TAB_NONE,
-                    var_get_value_name (var, cat2[v].value));
+          tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr1));
+         tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr2));
 
           /* Observed N */
           tab_float (table, 3, 1 + v * 3, TAB_NONE, cat1[v].count, 8, 0);
@@ -220,6 +229,9 @@ binomial_execute (const struct dataset *ds,
           /* Significance */
           sig = calculate_binomial (cat1[v].count, cat2[v].count, bst->p);
           tab_float (table, 6, 1 + v * 3, TAB_NONE, sig, 8, 3);
+
+         ds_destroy (&catstr1);
+         ds_destroy (&catstr2);
         }
 
       tab_text (table,  2, 0,  TAB_CENTER, _("Category"));