projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update required versions of the GSL and GTK libraries
[pspp-builds.git]
/
src
/
language
/
stats
/
binomial.c
diff --git
a/src/language/stats/binomial.c
b/src/language/stats/binomial.c
index 26e0257ca14030ca3d58a2ae10acd8f960b45d2c..b92018fdb400e9fe88d72ec93eed6d04d40d9bbe 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>
@@
-91,8
+91,8
@@
static bool
do_binomial (const struct dictionary *dict,
struct casereader *input,
const struct binomial_test *bst,
do_binomial (const struct dictionary *dict,
struct casereader *input,
const struct binomial_test *bst,
- struct freq
_mutable
*cat1,
- struct freq
_mutable
*cat2,
+ struct freq *cat1,
+ struct freq *cat2,
enum mv_class exclude
)
{
enum mv_class exclude
)
{
@@
-160,7
+160,7
@@
binomial_execute (const struct dataset *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 binomial_test *bst = (const struct binomial_test *) test;
const struct one_sample_test *ost = (const struct one_sample_test*) test;
- 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);
@@
-187,16
+187,14
@@
binomial_execute (const struct dataset *ds,
const struct fmt_spec *wfmt = wvar ?
var_get_print_format (wvar) : & F_8_0;
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);
+ struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1);
tab_title (table, _("Binomial Test"));
tab_headers (table, 2, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, TAL_1,
tab_title (table, _("Binomial Test"));
tab_headers (table, 2, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, TAL_1,
- 0, 0, tab
le->nc
- 1, tab_nr(table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr(table) - 1 );
for (v = 0 ; v < ost->n_vars; ++v)
{
for (v = 0 ; v < ost->n_vars; ++v)
{