projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added type 3 sums of squares to GLM
[pspp]
/
src
/
language
/
stats
/
crosstabs.q
diff --git
a/src/language/stats/crosstabs.q
b/src/language/stats/crosstabs.q
index b12bf6cfe60915dd91afa4f249b6a3f4b6fc3300..cf9473e87d378b097c0b62cc2dda6c6accbc9405 100644
(file)
--- a/
src/language/stats/crosstabs.q
+++ b/
src/language/stats/crosstabs.q
@@
-37,9
+37,9
@@
#include "data/casegrouper.h"
#include "data/casereader.h"
#include "data/data-out.h"
#include "data/casegrouper.h"
#include "data/casereader.h"
#include "data/data-out.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/format.h"
#include "data/dictionary.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/value-labels.h"
#include "data/variable.h"
#include "language/command.h"
#include "data/value-labels.h"
#include "data/variable.h"
#include "language/command.h"
@@
-1492,7
+1492,7
@@
table_value_missing (struct crosstabs_proc *proc,
free (s);
}
else
free (s);
}
else
- tab_value (table, c, r, opt, v,
proc->dict
, print);
+ tab_value (table, c, r, opt, v,
var
, print);
}
}
}
}
@@
-1751,7
+1751,7
@@
display_chisq (struct pivot_table *pt, struct tab_table *chisq,
calc_chisq (pt, chisq_v, df, &fisher1, &fisher2);
calc_chisq (pt, chisq_v, df, &fisher1, &fisher2);
- tab_offset (chisq, pt->n_vars - 2, -1);
+ tab_offset (chisq, pt->n_
consts + pt->n_
vars - 2, -1);
for (i = 0; i < N_CHISQ; i++)
{
for (i = 0; i < N_CHISQ; i++)
{
@@
-1828,7
+1828,7
@@
display_symmetric (struct crosstabs_proc *proc, struct pivot_table *pt,
somers_d_v, somers_d_ase, somers_d_t))
return;
somers_d_v, somers_d_ase, somers_d_t))
return;
- tab_offset (sym, pt->n_vars - 2, -1);
+ tab_offset (sym, pt->n_
consts + pt->n_
vars - 2, -1);
for (i = 0; i < N_SYMMETRIC; i++)
{
for (i = 0; i < N_SYMMETRIC; i++)
{
@@
-1873,7
+1873,7
@@
display_risk (struct pivot_table *pt, struct tab_table *risk)
if (!calc_risk (pt, risk_v, upper, lower, c))
return;
if (!calc_risk (pt, risk_v, upper, lower, c))
return;
- tab_offset (risk, pt->n_vars - 2, -1);
+ tab_offset (risk, pt->n_
consts + pt->n_
vars - 2, -1);
for (i = 0; i < 3; i++)
{
for (i = 0; i < 3; i++)
{
@@
-1998,7
+1998,7
@@
display_directional (struct crosstabs_proc *proc, struct pivot_table *pt,
if (!calc_directional (proc, pt, direct_v, direct_ase, direct_t))
return;
if (!calc_directional (proc, pt, direct_v, direct_ase, direct_t))
return;
- tab_offset (direct, pt->n_vars - 2, -1);
+ tab_offset (direct, pt->n_
consts + pt->n_
vars - 2, -1);
for (i = 0; i < N_DIRECTIONAL; i++)
{
for (i = 0; i < N_DIRECTIONAL; i++)
{