projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refacotring
[pspp]
/
src
/
language
/
stats
/
ctables.c
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index 7f5ac97f8bb9de9b0f2aac8a059aec589c4e481c..6c8812a1a4bc2c3506d097de63eae0416ad9841a 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4694,51
+4694,36
@@
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->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+ && t->clabels_from_axis != PIVOT_AXIS_LAYER)
{
{
- if (
a == PIVOT_AXIS_COLUMN
)
- n_drop =
1
;
+ if (
t->clabels_to_axis != PIVOT_AXIS_LAYER
)
+ n_drop =
a == t->clabels_from_axis ? 2 : 0
;
else
{
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;
- 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;
- else if (at == CTAT_
COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN
)
+ else if (at == CTAT_
ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW
)
{
drop_inner = true;
n_drop = 0;
}
{
drop_inner = true;
n_drop = 0;
}
- else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
- n_drop = 0;
- else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
{
drop_inner = true;
n_drop = 0;
}
{
drop_inner = true;
n_drop = 0;
}
- else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_
LAYER
)
+ else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_
COLUMN
)
{
drop_inner = true;
n_drop = 0;
}
{
drop_inner = true;
n_drop = 0;
}
- else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+ else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ n_drop = 0;
+ else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
{
drop_inner = true;
n_drop = 0;
{
drop_inner = true;
n_drop = 0;
@@
-4751,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)