projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
710f5de
)
refactoring
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:34:19 +0000
(22:34 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 05:34:19 +0000
(22:34 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index ff8f1abbc0a6f0f95b7f8a3b40f620507b0f8a37..b5a9101b7bfb6bc58c3b1a27e65fc76acee959be 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4694,15
+4694,15
@@
ctables_prepare_table (struct ctables_table *t)
size_t n_drop;
bool drop_inner = false;
if (at == CTAT_SUBTABLE
size_t n_drop;
bool drop_inner = false;
if (at == CTAT_SUBTABLE
- && 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->clabels_from_axis != PIVOT_AXIS_LAYER
- && t->clabels_to_axis == PIVOT_AXIS_LAYER)
+ && t->clabels_from_axis != PIVOT_AXIS_LAYER)
{
{
- drop_inner = a == t->clabels_from_axis;
- n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+ if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
+ n_drop = a == t->clabels_from_axis ? 2 : 0;
+ else
+ {
+ 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;
@@
-4736,9
+4736,9
@@
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 ((
t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && (at == CTAT_ROW || at == CTAT_LAYERROW)
&& a == PIVOT_AXIS_ROW)
- || (
t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && (at == CTAT_COL || at == CTAT_LAYERCOL)
&& a == PIVOT_AXIS_COLUMN))
- 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))
+
n_drop++;
}
if (drop_inner)
}
if (drop_inner)