projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused variable
[pspp-builds.git]
/
src
/
language
/
stats
/
binomial.c
diff --git
a/src/language/stats/binomial.c
b/src/language/stats/binomial.c
index 68a747bbd8a12a1401ce94c9087b30db19377647..8126daf36c725d80652a6add4db7098c35dcdd72 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, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 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
@@
-16,7
+16,7
@@
#include <config.h>
#include <libpspp/compiler.h>
#include <config.h>
#include <libpspp/compiler.h>
-#include <output/tab
le
.h>
+#include <output/tab.h>
#include <data/format.h>
#include <data/case.h>
#include <data/format.h>
#include <data/case.h>
@@
-45,8
+45,6
@@
#include <minmax.h>
#include <minmax.h>
-#include <libpspp/hash.h>
-
static double calculate_binomial_internal (double n1, double n2,
double p);
static double calculate_binomial_internal (double n1, double n2,
double p);
@@
-90,15
+88,15
@@
calculate_binomial_internal (double n1, double n2, double p)
static bool
do_binomial (const struct dictionary *dict,
struct casereader *input,
static bool
do_binomial (const struct dictionary *dict,
struct casereader *input,
- const struct
binomial_test *b
st,
- struct freq
_mutable
*cat1,
- struct freq
_mutable
*cat2,
+ const struct
one_sample_test *o
st,
+ struct freq *cat1,
+ struct freq *cat2,
enum mv_class exclude
)
{
enum mv_class exclude
)
{
+ const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent);
bool warn = true;
bool warn = true;
- const struct one_sample_test *ost = (const struct one_sample_test *) bst;
struct ccase *c;
for (; (c = casereader_read (input)) != NULL; case_unref (c))
struct ccase *c;
for (; (c = casereader_read (input)) != NULL; case_unref (c))
@@
-157,10
+155,10
@@
binomial_execute (const struct dataset *ds,
{
int v;
const struct dictionary *dict = dataset_dict (ds);
{
int v;
const struct dictionary *dict = dataset_dict (ds);
- const struct
binomial_test *bst = (const struct binomial_test *) test
;
- const struct
one_sample_test *ost = (const struct one_sample_test*) test
;
+ const struct
one_sample_test *ost = UP_CAST (test, const struct one_sample_test, parent)
;
+ const struct
binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent)
;
- struct freq
_mutable
*cat[2];
+ struct freq *cat[2];
int i;
assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
int i;
assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
@@
-181,15
+179,13
@@
binomial_execute (const struct dataset *ds,
}
}
}
}
- if (do_binomial (dataset_dict (ds), input,
b
st, cat[0], cat[1], exclude))
+ if (do_binomial (dataset_dict (ds), input,
o
st, cat[0], cat[1], exclude))
{
const struct variable *wvar = dict_get_weight (dict);
const struct fmt_spec *wfmt = wvar ?
var_get_print_format (wvar) : & F_8_0;
{
const struct variable *wvar = dict_get_weight (dict);
const struct fmt_spec *wfmt = wvar ?
var_get_print_format (wvar) : & F_8_0;
- struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1, 0);
-
- tab_dim (table, tab_natural_dimensions, NULL, NULL);
+ struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1);
tab_title (table, _("Binomial Test"));
tab_title (table, _("Binomial Test"));