projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a58399e
)
refactor
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:44:25 +0000
(22:44 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:44:25 +0000
(22:44 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index cd963e785feb0b83ba8ea1a4e4e3f36b5e6c77d6..6d3f44d327d10410898127ef171c497c52d6cbce 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4732,18
+4732,24
@@
ctables_prepare_table (struct ctables_table *t)
n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
else if (at == CTAT_LAYERCOL)
n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
else if (at == CTAT_LAYERCOL)
n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
- else
+ else if (at == CTAT_SUBTABLE)
+ n_drop = a != PIVOT_AXIS_LAYER;
+ else if (at == CTAT_ROW)
{
{
- n_drop = 0;
- if (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
- : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
- : at == CTAT_COL ? a == PIVOT_AXIS_ROW
- : false)
+ n_drop = a == PIVOT_AXIS_COLUMN;
+ if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
n_drop++;
n_drop++;
- if ((at == CTAT_ROW && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
- || (at == CTAT_COL && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW))
+ }
+ else if (at == CTAT_COL)
+ {
+ n_drop = a == PIVOT_AXIS_ROW;
+ if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
n_drop++;
}
n_drop++;
}
+ else
+ {
+ n_drop = 0;
+ }
if (drop_inner)
{
if (drop_inner)
{