projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Fix "NPAR TESTS BINOMIAL, P = 0.5; N1/N2 < 1" test failure.
[pspp]
/
src
/
language
/
stats
/
rank.q
diff --git
a/src/language/stats/rank.q
b/src/language/stats/rank.q
index c225370e459269cc572430f87e533f7a591662c4..f53ef2d01475a8c76040615898449e51f554f301 100644
(file)
--- a/
src/language/stats/rank.q
+++ b/
src/language/stats/rank.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2007, 2009
, 2010
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
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
@@
-35,8
+35,7
@@
#include <libpspp/compiler.h>
#include <libpspp/taint.h>
#include <math/sort.h>
#include <libpspp/compiler.h>
#include <libpspp/taint.h>
#include <math/sort.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_cdf.h>
@@
-692,7
+691,7
@@
cmd_rank (struct lexer *lexer, struct dataset *ds)
int v;
tab_output_text (0, _("Variables Created By RANK"));
int v;
tab_output_text (0, _("Variables Created By RANK"));
- tab_output_text (0, "
\n
");
+ tab_output_text (0, "");
for (i = 0 ; i < n_rank_specs ; ++i )
{
for (i = 0 ; i < n_rank_specs ; ++i )
{
@@
-797,9
+796,9
@@
cmd_rank (struct lexer *lexer, struct dataset *ds)
static int
rank_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd UNUSED, void *aux UNUSED)
{
static int
rank_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd UNUSED, void *aux UNUSED)
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
- if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tok
id
(lexer)) == NULL)
+ if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tok
cstr
(lexer)) == NULL)
&& lex_token (lexer) != T_ALL)
return 2;
&& lex_token (lexer) != T_ALL)
return 2;
@@
-809,7
+808,7
@@
rank_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_rank
if ( lex_match (lexer, T_BY) )
{
if ( lex_match (lexer, T_BY) )
{
- if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tok
id
(lexer)) == NULL))
+ if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tok
cstr
(lexer)) == NULL))
{
return 2;
}
{
return 2;
}
@@
-848,9
+847,9
@@
parse_rank_function (struct lexer *lexer, struct dictionary *dict, struct cmd_ra
while( lex_token (lexer) == T_ID )
{
while( lex_token (lexer) == T_ID )
{
- if ( dict_lookup_var (dict, lex_tok
id
(lexer)) != NULL )
+ if ( dict_lookup_var (dict, lex_tok
cstr
(lexer)) != NULL )
{
{
- msg(SE, _("Variable %s already exists."), lex_tok
id
(lexer));
+ msg(SE, _("Variable %s already exists."), lex_tok
cstr
(lexer));
return 0;
}
if ( var_count >= subcase_get_n_fields (&sc) )
return 0;
}
if ( var_count >= subcase_get_n_fields (&sc) )
@@
-859,7
+858,7
@@
parse_rank_function (struct lexer *lexer, struct dictionary *dict, struct cmd_ra
return 0;
}
return 0;
}
- destvar = create_rank_variable (dict, f, src_vars[var_count], lex_tok
id
(lexer));
+ destvar = create_rank_variable (dict, f, src_vars[var_count], lex_tok
cstr
(lexer));
rank_specs[n_rank_specs - 1].destvars[var_count] = destvar ;
lex_get (lexer);
rank_specs[n_rank_specs - 1].destvars[var_count] = destvar ;
lex_get (lexer);
@@
-933,13
+932,13
@@
rank_custom_ntiles (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cm
{
struct dictionary *dict = dataset_dict (ds);
{
struct dictionary *dict = dataset_dict (ds);
- if ( lex_force_match (lexer,
'('
) )
+ if ( lex_force_match (lexer,
T_LPAREN
) )
{
if ( lex_force_int (lexer) )
{
k_ntiles = lex_integer (lexer);
lex_get (lexer);
{
if ( lex_force_int (lexer) )
{
k_ntiles = lex_integer (lexer);
lex_get (lexer);
- lex_force_match (lexer,
')'
);
+ lex_force_match (lexer,
T_RPAREN
);
}
else
return 0;
}
else
return 0;