projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
037d8f6
)
refactor
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 06:29:44 +0000
(23:29 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 06:29:44 +0000
(23:29 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index c3c797a52c0fb6d814e3aa4f27f071d31824af64..e78c0cf169d504524636a41db64c4aca40d55c7d 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4702,7
+4702,7
@@
ctables_prepare_table (struct ctables_table *t)
if (k != nest->scale_idx)
nest->areas[at][nest->n_areas[at]++] = k;
if (k != nest->scale_idx)
nest->areas[at][nest->n_areas[at]++] = k;
- int n_drop
= 0
;
+ int n_drop;
switch (at)
{
case CTAT_SUBTABLE:
switch (at)
{
case CTAT_SUBTABLE:
@@
-4723,19
+4723,21
@@
ctables_prepare_table (struct ctables_table *t)
case CTAT_ROW:
case CTAT_COL:
case CTAT_ROW:
case CTAT_COL:
- if (a == atb)
- {
- if (t->clabels_from_axis == atb)
- n_drop = -1;
- else if (t->clabels_to_axis != atb)
- n_drop = 1;
- }
- else if (a == ata)
+ if (a == ata)
n_drop = t->label_axis[ata] == atb;
n_drop = t->label_axis[ata] == atb;
+ else if (a != atb)
+ n_drop = 0;
+ else if (t->clabels_from_axis == atb)
+ n_drop = -1;
+ else if (t->clabels_to_axis != atb)
+ n_drop = 1;
+ else
+ n_drop = 0;
break;
case CTAT_LAYER:
case CTAT_TABLE:
break;
case CTAT_LAYER:
case CTAT_TABLE:
+ n_drop = 0;
break;
}
break;
}