projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent test failure when non-English language selected
[pspp]
/
src
/
language
/
stats
/
binomial.c
diff --git
a/src/language/stats/binomial.c
b/src/language/stats/binomial.c
index 39b8506d53edb7f184df01831522e0da7511217e..b62b4dce1375a11c11030ca299de2284141261b9 100644
(file)
--- a/
src/language/stats/binomial.c
+++ b/
src/language/stats/binomial.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-41,7
+41,6
@@
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_randist.h>
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_randist.h>
-#include <gsl-extras/gsl-extras.h>
#include <minmax.h>
#include <minmax.h>
@@
-79,7
+78,7
@@
calculate_binomial_internal (double n1, double n2, double p)
/* SPSS Statistical Algorithms has completely different and WRONG
advice here. */
/* SPSS Statistical Algorithms has completely different and WRONG
advice here. */
- double sig1tailed = gsl
extras_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;
if ( p == 0.5 )
return sig1tailed > 0.5 ? 1.0 :sig1tailed * 2.0;
@@
-99,41
+98,41
@@
do_binomial (const struct dictionary *dict,
bool warn = true;
const struct one_sample_test *ost = (const struct one_sample_test *) bst;
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;
{
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];
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))
int width = var_get_width (var);
if (var_is_value_missing (var, value, exclude))
-
break
;
+
continue
;
if ( NULL == cat1[v].value )
{
cat1[v].value = value_dup (value, width);
cat1[v].count = w;
}
if ( NULL == cat1[v].value )
{
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;
}
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));
}
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);
}
}
return casereader_destroy (input);
}
@@
-144,7
+143,9
@@
void
binomial_execute (const struct dataset *ds,
struct casereader *input,
enum mv_class exclude,
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;
{
int v;
const struct binomial_test *bst = (const struct binomial_test *) test;
@@
-157,16
+158,20
@@
binomial_execute (const struct dataset *ds,
if ( bst->category1 != SYSMIS )
{
if ( bst->category1 != SYSMIS )
{
+ int i;
union value v;
v.f = bst->category1;
union value v;
v.f = bst->category1;
- cat1->value = value_dup (&v, 0);
+ for (i = 0; i < ost->n_vars; i++)
+ cat1[i].value = value_dup (&v, 0);
}
if ( bst->category2 != SYSMIS )
{
}
if ( bst->category2 != SYSMIS )
{
+ int i;
union value v;
v.f = bst->category2;
union value v;
v.f = bst->category2;
- cat2->value = value_dup (&v, 0);
+ for (i = 0; i < ost->n_vars; i++)
+ cat2[i].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))