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