X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fbinomial.c;h=39b8506d53edb7f184df01831522e0da7511217e;hb=f1861ea4c715dfaddd84ff14be2ab92b13379014;hp=91910ee5102e5d28dc927a3404b129d9c908c8a9;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 91910ee510..39b8506d53 100644
--- a/src/language/stats/binomial.c
+++ b/src/language/stats/binomial.c
@@ -1,25 +1,22 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <libpspp/compiler.h>
 #include <output/table.h>
-#include <libpspp/alloc.h>
 
 #include <data/case.h>
 #include <data/casereader.h>
@@ -35,6 +32,8 @@
 #include "binomial.h"
 #include "freq.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -77,7 +76,7 @@ calculate_binomial (double n1, double n2, double p)
 static double
 calculate_binomial_internal (double n1, double n2, double p)
 {
-  /* SPSS Statistical Algorithms has completely different and WRONG 
+  /* SPSS Statistical Algorithms has completely different and WRONG
      advice here. */
 
   double sig1tailed = gslextras_cdf_binomial_P (n1, n1 + n2, p);
@@ -170,7 +169,7 @@ binomial_execute (const struct dataset *ds,
       cat2->value = value_dup (&v, 0);
     }
 
-  if (do_binomial (dataset_dict(ds), input, bst, cat1, cat2, exclude)) 
+  if (do_binomial (dataset_dict(ds), input, bst, cat1, cat2, exclude))
     {
       struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1, 0);
 
@@ -186,7 +185,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 */
@@ -199,10 +207,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);
@@ -222,6 +228,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"));
@@ -236,12 +245,12 @@ binomial_execute (const struct dataset *ds,
       tab_vline (table, TAL_2, 2, 0, tab_nr (table) -1);
       tab_submit (table);
     }
-  
-  for (v = 0; v < ost->n_vars; v++) 
+
+  for (v = 0; v < ost->n_vars; v++)
     {
       free (cat1[v].value);
-      free (cat2[v].value); 
+      free (cat2[v].value);
     }
   free (cat1);
-  free (cat2); 
+  free (cat2);
 }