projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3221f4a
)
refactoring
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:19:55 +0000
(22:19 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:19:55 +0000
(22:19 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index 7f5ac97f8bb9de9b0f2aac8a059aec589c4e481c..fa43892176da1642060ed362149eaee80d381571 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4697,25
+4697,17
@@
ctables_prepare_table (struct ctables_table *t)
&& t->clabels_from_axis != PIVOT_AXIS_LAYER
&& t->clabels_to_axis != PIVOT_AXIS_LAYER)
n_drop = a == t->clabels_from_axis ? 2 : 0;
&& t->clabels_from_axis != PIVOT_AXIS_LAYER
&& t->clabels_to_axis != PIVOT_AXIS_LAYER)
n_drop = a == t->clabels_from_axis ? 2 : 0;
- else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+ else if (at == CTAT_SUBTABLE
+ && t->clabels_from_axis != PIVOT_AXIS_LAYER
+ && t->clabels_to_axis == PIVOT_AXIS_LAYER)
{
{
- if (a == PIVOT_AXIS_COLUMN)
+ if (a == PIVOT_AXIS_LAYER)
+ n_drop = 0;
+ else if (a != t->clabels_from_axis)
n_drop = 1;
else
{
n_drop = 1;
else
{
- if (a == PIVOT_AXIS_ROW)
- drop_inner = true;
- n_drop = 0;
- }
- }
- else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
- {
- if (a == PIVOT_AXIS_ROW)
- n_drop = 1;
- else
- {
- if (a == PIVOT_AXIS_COLUMN)
- drop_inner = true;
+ drop_inner = true;
n_drop = 0;
}
}
n_drop = 0;
}
}