projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a3a6f7e
)
reractor
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:41:38 +0000
(22:41 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:41:38 +0000
(22:41 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index 6c8812a1a4bc2c3506d097de63eae0416ad9841a..cd963e785feb0b83ba8ea1a4e4e3f36b5e6c77d6 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4728,6
+4728,10
@@
ctables_prepare_table (struct ctables_table *t)
drop_inner = true;
n_drop = 0;
}
drop_inner = true;
n_drop = 0;
}
+ else if (at == CTAT_LAYERROW)
+ 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
{
n_drop = 0;
else
{
n_drop = 0;
@@
-4736,8
+4740,8
@@
ctables_prepare_table (struct ctables_table *t)
: at == CTAT_COL ? a == PIVOT_AXIS_ROW
: false)
n_drop++;
: at == CTAT_COL ? a == PIVOT_AXIS_ROW
: false)
n_drop++;
- if ((
(at == CTAT_ROW || at == CTAT_LAYERROW) && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && a == PIVOT_AXIS_ROW
)
- || (
(at == CTAT_COL || at == CTAT_LAYERCOL) && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && a == PIVOT_AXIS_COLUMN
))
+ 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
))
n_drop++;
}
n_drop++;
}