X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fbinomial.c;h=b8ed5da9acecbf4e732c3da620ef7cc8bab4b582;hb=72fa53029f0a25e767b07a0ae46a0d6f4a74f4d7;hp=94d0d9721e0b7f4c543d44a975ec8b8b9b7cbed0;hpb=2be9bee9da6a2ce27715e58128569594319abfa2;p=pspp

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 94d0d9721e..b8ed5da9ac 100644
--- 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, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010, 2011, 2014 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
@@ -18,6 +18,7 @@
 
 #include "language/stats/binomial.h"
 
+#include <float.h>
 #include <gsl/gsl_cdf.h>
 #include <gsl/gsl_randist.h>
 
@@ -111,26 +112,26 @@ do_binomial (const struct dictionary *dict,
 
 	  if (bst->cutpoint != SYSMIS)
 	    {
-	      if ( cat1[v].value.f >= value )
+	      if ( cat1[v].values[0].f >= value )
 		  cat1[v].count  += w;
 	      else
 		  cat2[v].count += w;
 	    }
 	  else
 	    {
-	      if ( SYSMIS == cat1[v].value.f )
+	      if ( SYSMIS == cat1[v].values[0].f )
 		{
-		  cat1[v].value.f = value;
+		  cat1[v].values[0].f = value;
 		  cat1[v].count = w;
 		}
-	      else if ( cat1[v].value.f == value )
+	      else if ( cat1[v].values[0].f == value )
 		cat1[v].count += w;
-	      else if ( SYSMIS == cat2[v].value.f )
+	      else if ( SYSMIS == cat2[v].values[0].f )
 		{
-		  cat2[v].value.f = value;
+		  cat2[v].values[0].f = value;
 		  cat2[v].count = w;
 		}
-	      else if ( cat2[v].value.f == value )
+	      else if ( cat2[v].values[0].f == value )
 		cat2[v].count += w;
 	      else if ( bst->category1 == SYSMIS)
 		msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
@@ -171,7 +172,7 @@ binomial_execute (const struct dataset *ds,
       cat[i] = xnmalloc (ost->n_vars, sizeof *cat[i]);
       for (v = 0; v < ost->n_vars; v++)
         {
-          cat[i][v].value.f = value;
+          cat[i][v].values[0].f = value;
           cat[i][v].count = 0;
         }
     }
@@ -183,6 +184,7 @@ binomial_execute (const struct dataset *ds,
 	var_get_print_format (wvar) : & F_8_0;
 
       struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1);
+      tab_set_format (table, RC_WEIGHT, wfmt);
 
       tab_title (table, _("Binomial Test"));
 
@@ -202,12 +204,13 @@ binomial_execute (const struct dataset *ds,
 
 	  if ( bst->cutpoint != SYSMIS)
 	    {
-	      ds_put_format (&catstr[0], "<= %g", bst->cutpoint);
+	      ds_put_format (&catstr[0], "<= %.*g",
+                             DBL_DIG + 1, bst->cutpoint);
 	    }
           else
             {
-              var_append_value_name (var, &cat[0][v].value, &catstr[0]);
-              var_append_value_name (var, &cat[1][v].value, &catstr[1]);
+              var_append_value_name (var, cat[0][v].values, &catstr[0]);
+              var_append_value_name (var, cat[1][v].values, &catstr[1]);
             }
 
           tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3);
@@ -219,31 +222,31 @@ binomial_execute (const struct dataset *ds,
           tab_text (table, 1, 3 + v * 3, TAB_LEFT, _("Total"));
 
           /* Test Prop */
-          tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL);
+          tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL, RC_OTHER);
 
           /* Category labels */
           tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr[0]));
 	  tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr[1]));
 
           /* Observed N */
-          tab_double (table, 3, 1 + v * 3, TAB_NONE, cat[0][v].count, wfmt);
-          tab_double (table, 3, 2 + v * 3, TAB_NONE, cat[1][v].count, wfmt);
+          tab_double (table, 3, 1 + v * 3, TAB_NONE, cat[0][v].count, NULL, RC_WEIGHT);
+          tab_double (table, 3, 2 + v * 3, TAB_NONE, cat[1][v].count, NULL, RC_WEIGHT);
 
           n_total = cat[0][v].count + cat[1][v].count;
-          tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, wfmt);
+          tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, NULL, RC_WEIGHT);
 
           /* Observed Proportions */
           tab_double (table, 4, 1 + v * 3, TAB_NONE,
-                     cat[0][v].count / n_total, NULL);
+		      cat[0][v].count / n_total, NULL, RC_OTHER);
           tab_double (table, 4, 2 + v * 3, TAB_NONE,
-                     cat[1][v].count / n_total, NULL);
+		      cat[1][v].count / n_total, NULL, RC_OTHER);
 
           tab_double (table, 4, 3 + v * 3, TAB_NONE,
-                     (cat[0][v].count + cat[1][v].count) / n_total, NULL);
+		      (cat[0][v].count + cat[1][v].count) / n_total, NULL, RC_OTHER);
 
           /* Significance */
           sig = calculate_binomial (cat[0][v].count, cat[1][v].count, bst->p);
-          tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL);
+          tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL, RC_PVALUE);
 
 	  ds_destroy (&catstr[0]);
 	  ds_destroy (&catstr[1]);