projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b9e9bd
)
refactor
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:58:35 +0000
(22:58 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:58:35 +0000
(22:58 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index 5f7162fd2ad39134ce65c38130f1d231548cba1a..aeae6223fc45db75643f608772fc39b3a4392db0 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4726,24
+4726,19
@@
ctables_prepare_table (struct ctables_table *t)
case CTAT_ROW:
case CTAT_COL:
case CTAT_ROW:
case CTAT_COL:
- if (a == atb && t->label_axis[ata] == atb)
- n_drop = 0;
- else if (a == atb && t->label_axis[atb] == ata)
+ if (a == atb)
{
{
- drop_inner = true;
- n_drop = 0;
- }
- else if (a == atb && t->label_axis[atb] == PIVOT_AXIS_LAYER)
- {
- drop_inner = true;
- n_drop = 0;
- }
- else
- {
- n_drop = a == atb;
- if (a == ata && t->label_axis[ata] == atb)
- n_drop++;
+ if (t->label_axis[ata] == atb)
+ ;
+ else if (t->label_axis[atb] == ata)
+ drop_inner = true;
+ else if (t->label_axis[atb] == PIVOT_AXIS_LAYER)
+ drop_inner = true;
+ else
+ n_drop = 1;
}
}
+ if (a == ata && t->label_axis[ata] == atb)
+ n_drop++;
break;
case CTAT_LAYER:
break;
case CTAT_LAYER: