projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite PSPP output engine.
[pspp]
/
src
/
language
/
stats
/
oneway.q
diff --git
a/src/language/stats/oneway.q
b/src/language/stats/oneway.q
index 0f6b20a1db04cdf9503e4a21cd67cb2f22ecf6bf..2d55edff73fb286597a7be6771b467a9c4b6422c 100644
(file)
--- a/
src/language/stats/oneway.q
+++ b/
src/language/stats/oneway.q
@@
-40,8
+40,7
@@
#include <math/group-proc.h>
#include <math/group.h>
#include <math/levene.h>
#include <math/group-proc.h>
#include <math/group.h>
#include <math/levene.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
#include "sort-criteria.h"
#include <data/format.h>
#include "sort-criteria.h"
#include <data/format.h>
@@
-259,10
+258,8
@@
show_anova_table (void)
struct tab_table *t;
struct tab_table *t;
- t = tab_create (n_cols, n_rows
, 0
);
+ t = tab_create (n_cols, n_rows);
tab_headers (t, 2, 0, 1, 0);
tab_headers (t, 2, 0, 1, 0);
- tab_dim (t, tab_natural_dimensions, NULL);
-
tab_box (t,
TAL_2, TAL_2,
tab_box (t,
TAL_2, TAL_2,
@@
-370,9
+367,8
@@
show_descriptives (const struct dictionary *dict)
for ( v = 0; v < n_vars; ++v )
n_rows += group_proc_get (vars[v])->n_groups + 1;
for ( v = 0; v < n_vars; ++v )
n_rows += group_proc_get (vars[v])->n_groups + 1;
- t = tab_create (n_cols, n_rows
, 0
);
+ t = tab_create (n_cols, n_rows);
tab_headers (t, 2, 0, 2, 0);
tab_headers (t, 2, 0, 2, 0);
- tab_dim (t, tab_natural_dimensions, NULL);
/* Put a frame around the entire box, and vertical lines inside */
/* Put a frame around the entire box, and vertical lines inside */
@@
-517,9
+513,9
@@
show_homogeneity (void)
struct tab_table *t;
struct tab_table *t;
- t = tab_create (n_cols, n_rows
, 0
);
+ t = tab_create (n_cols, n_rows);
tab_headers (t, 1, 0, 1, 0);
tab_headers (t, 1, 0, 1, 0);
- tab_dim (t, tab_natural_dimensions, NULL);
+
/* Put a frame around the entire box, and vertical lines inside */
tab_box (t,
/* Put a frame around the entire box, and vertical lines inside */
tab_box (t,
@@
-577,9
+573,8
@@
show_contrast_coeffs (short *bad_contrast)
struct tab_table *t;
struct tab_table *t;
- t = tab_create (n_cols, n_rows
, 0
);
+ t = tab_create (n_cols, n_rows);
tab_headers (t, 2, 0, 2, 0);
tab_headers (t, 2, 0, 2, 0);
- tab_dim (t, tab_natural_dimensions, NULL);
/* Put a frame around the entire box, and vertical lines inside */
tab_box (t,
/* Put a frame around the entire box, and vertical lines inside */
tab_box (t,
@@
-661,9
+656,8
@@
show_contrast_tests (short *bad_contrast)
struct tab_table *t;
struct tab_table *t;
- t = tab_create (n_cols, n_rows
, 0
);
+ t = tab_create (n_cols, n_rows);
tab_headers (t, 3, 0, 1, 0);
tab_headers (t, 3, 0, 1, 0);
- tab_dim (t, tab_natural_dimensions, NULL);
/* Put a frame around the entire box, and vertical lines inside */
tab_box (t,
/* Put a frame around the entire box, and vertical lines inside */
tab_box (t,