X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ft-test.q;h=3affde209b9413d1b7d41172db41640c6a53aa1d;hb=c6fe58a22249f4f486b42f35fd8bd537c91e8e6e;hp=466bf9e75129a9276f62587006e892532ce3dbcc;hpb=8ef8acb7c70a321963d30f2264e8f91e16427fcf;p=pspp-builds.git

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index 466bf9e7..3affde20 100644
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -240,11 +240,6 @@ static void calculate (struct cmd_t_test *,
 
 static  int mode;
 
-static struct cmd_t_test cmd;
-
-static bool bad_weight_warn = false;
-
-
 static int compare_group_binary (const struct group_statistics *a,
 				const struct group_statistics *b,
 				const struct group_properties *p);
@@ -258,6 +253,7 @@ static unsigned  hash_group_binary (const struct group_statistics *g,
 int
 cmd_t_test (struct lexer *lexer, struct dataset *ds)
 {
+  struct cmd_t_test cmd;
   struct casegrouper *grouper;
   struct casereader *group;
   bool ok;
@@ -338,8 +334,6 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
       return CMD_FAILURE;
     }
 
-  bad_weight_warn = true;
-
   /* Data pass. */
   grouper = casegrouper_create_splits (proc_open (ds), dataset_dict (ds));
   while (casegrouper_get_next_group (grouper, &group))
@@ -409,7 +403,7 @@ tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *c
 	}
     }
 
-  if (!parse_value (lexer, &gp.v.g_value[0], var_get_type (indep_var)))
+  if (!parse_value (lexer, &gp.v.g_value[0], var_get_width (indep_var)))
       return 0;
 
   lex_match (lexer, ',');
@@ -428,7 +422,7 @@ tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *c
       return 1;
     }
 
-  if (!parse_value (lexer, &gp.v.g_value[1], var_get_type (indep_var)))
+  if (!parse_value (lexer, &gp.v.g_value[1], var_get_width (indep_var)))
     return 0;
 
   n_group_values = 2;
@@ -677,7 +671,7 @@ ssbox_base_init (struct ssbox *this, int cols,int rows)
   tab_headers (this->t,0,0,1,0);
   tab_box (this->t, TAL_2, TAL_2, TAL_0, TAL_1, 0, 0, cols -1, rows -1 );
   tab_hline (this->t, TAL_2,0,cols-1,1);
-  tab_dim (this->t, tab_natural_dimensions);
+  tab_dim (this->t, tab_natural_dimensions, NULL);
 }
 
 void  ssbox_one_sample_populate (struct ssbox *ssb,
@@ -1386,7 +1380,7 @@ trbox_base_init (struct trbox *self, size_t data_rows, int cols)
   tab_headers (self->t,0,0,3,0);
   tab_box (self->t, TAL_2, TAL_2, TAL_0, TAL_0, 0, 0, cols -1, rows -1);
   tab_hline (self->t, TAL_2,0,cols-1,3);
-  tab_dim (self->t, tab_natural_dimensions);
+  tab_dim (self->t, tab_natural_dimensions, NULL);
 }
 
 
@@ -1418,7 +1412,7 @@ pscbox (const struct dictionary *dict)
   tab_box (table, TAL_2, TAL_2, TAL_0, TAL_1, 0, 0, cols -1, rows -1 );
   tab_hline (table, TAL_2, 0, cols - 1, 1);
   tab_vline (table, TAL_2, 2, 0, rows - 1);
-  tab_dim (table, tab_natural_dimensions);
+  tab_dim (table, tab_natural_dimensions, NULL);
   tab_title (table, _ ("Paired Samples Correlations"));
 
   /* column headings */