}
}
+/* XXX:
+ - unweighted summaries (U*)
+ - lower confidence limits (*.LCL)
+ - upper confidence limits (*.UCL)
+ - standard error (*.SE)
+ */
+#define SUMMARIES \
+ /* All variables. */ \
+ S(CTSF_COUNT, "COUNT", N_("Count"), CTF_COUNT, CTFA_ALL) \
+ S(CTSF_ECOUNT, "ECOUNT", N_("Adjusted Count"), CTF_COUNT, CTFA_ALL) \
+ S(CTSF_ROWPCT_COUNT, "ROWPCT.COUNT", N_("Row %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_COLPCT_COUNT, "COLPCT.COUNT", N_("Column %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_TABLEPCT_COUNT, "TABLEPCT.COUNT", N_("Table %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_SUBTABLEPCT_COUNT, "SUBTABLEPCT.COUNT", N_("Subtable %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERPCT_COUNT, "LAYERPCT.COUNT", N_("Layer %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERROWPCT_COUNT, "LAYERROWPCT.COUNT", N_("Layer Row %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERCOLPCT_COUNT, "LAYERCOLPCT.COUNT", N_("Layer Column %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_ROWPCT_VALIDN, "ROWPCT.VALIDN", N_("Row Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_COLPCT_VALIDN, "COLPCT.VALIDN", N_("Column Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_TABLEPCT_VALIDN, "TABLEPCT.VALIDN", N_("Table Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_SUBTABLEPCT_VALIDN, "SUBTABLEPCT.VALIDN", N_("Subtable Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERPCT_VALIDN, "LAYERPCT.VALIDN", N_("Layer Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERROWPCT_VALIDN, "LAYERROWPCT.VALIDN", N_("Layer Row Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERCOLPCT_VALIDN, "LAYERCOLPCT.VALIDN", N_("Layer Column Valid N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_ROWPCT_TOTALN, "ROWPCT.TOTALN", N_("Row Total N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_COLPCT_TOTALN, "COLPCT.TOTALN", N_("Column Total N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_TABLEPCT_TOTALN, "TABLEPCT.TOTALN", N_("Table Total N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_SUBTABLEPCT_TOTALN, "SUBTABLEPCT.TOTALN", N_("Subtable Total N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERPCT_TOTALN, "LAYERPCT.TOTALN", N_("Layer Total N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERROWPCT_TOTALN, "LAYERROWPCT.TOTALN", N_("Layer Row Total N %"), CTF_PERCENT, CTFA_ALL) \
+ S(CTSF_LAYERCOLPCT_TOTALN, "LAYERCOLPCT.TOTALN", N_("Layer Column Total N %"), CTF_PERCENT, CTFA_ALL) \
+ \
+ /* Scale variables, totals, and subtotals. */ \
+ S(CTSF_MAXIMUM, "MAXIMUM", N_("Maximum"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_MEAN, "MEAN", N_("Mean"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_MEDIAN, "MEDIAN", N_("Median"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_MINIMUM, "MINIMUM", N_("Minimum"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_MISSING, "MISSING", N_("Missing"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_MODE, "MODE", N_("Mode"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_PTILE, "PTILE", N_("Percentile"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_RANGE, "RANGE", N_("Range"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_SEMEAN, "SEMEAN", N_("Std Error of Mean"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_STDDEV, "STDDEV", N_("Std Deviation"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_SUM, "SUM", N_("Sum"), CTF_GENERAL, CTFA_SCALE) \
+ S(CSTF_TOTALN, "TOTALN", N_("Total N"), CTF_COUNT, CTFA_SCALE) \
+ S(CTSF_ETOTALN, "ETOTALN", N_("Adjusted Total N"), CTF_COUNT, CTFA_SCALE) \
+ S(CTSF_VALIDN, "VALIDN", N_("Valid N"), CTF_COUNT, CTFA_SCALE) \
+ S(CTSF_EVALIDN, "EVALIDN", N_("Adjusted Valid N"), CTF_COUNT, CTFA_SCALE) \
+ S(CTSF_VARIANCE, "VARIANCE", N_("Variance"), CTF_GENERAL, CTFA_SCALE) \
+ S(CTSF_ROWPCT_SUM, "ROWPCT.SUM", N_("Row Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ S(CTSF_COLPCT_SUM, "COLPCT.SUM", N_("Column Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ S(CTSF_TABLEPCT_SUM, "TABLEPCT.SUM", N_("Table Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ S(CTSF_SUBTABLEPCT_SUM, "SUBTABLEPCT.SUM", N_("Subtable Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ S(CTSF_LAYERPCT_SUM, "LAYERPCT.SUM", N_("Layer Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ S(CTSF_LAYERROWPCT_SUM, "LAYERROWPCT.SUM", N_("Layer Row Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ S(CTSF_LAYERCOLPCT_SUM, "LAYERCOLPCT.SUM", N_("Layer Column Sum %"), CTF_PERCENT, CTFA_SCALE) \
+ \
+ /* Multiple response sets. */ \
+ S(CTSF_RESPONSES, "RESPONSES", N_("Responses"), CTF_COUNT, CTFA_MRSETS) \
+ S(CTSF_ROWPCT_RESPONSES, "ROWPCT.RESPONSES", N_("Row Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_COLPCT_RESPONSES, "COLPCT.RESPONSES", N_("Column Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_TABLEPCT_RESPONSES, "TABLEPCT.RESPONSES", N_("Table Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_SUBTABLEPCT_RESPONSES, "SUBTABLEPCT.RESPONSES", N_("Subtable Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERPCT_RESPONSES, "LAYERPCT.RESPONSES", N_("Layer Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERROWPCT_RESPONSES, "LAYERROWPCT.RESPONSES", N_("Layer Row Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERCOLPCT_RESPONSES, "LAYERCOLPCT.RESPONSES", N_("Layer Column Responses %"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_ROWPCT_RESPONSES_COUNT, "ROWPCT.RESPONSES.COUNT", N_("Row Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_COLPCT_RESPONSES_COUNT, "COLPCT.RESPONSES.COUNT", N_("Column Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_TABLEPCT_RESPONSES_COUNT, "TABLEPCT.RESPONSES.COUNT", N_("Table Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_SUBTABLEPCT_RESPONSES_COUNT, "SUBTABLEPCT.RESPONSES.COUNT", N_("Subtable Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERPCT_RESPONSES_COUNT, "LAYERPCT.RESPONSES.COUNT", N_("Layer Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERROWPCT_RESPONSES_COUNT, "LAYERROWPCT.RESPONSES.COUNT", N_("Layer Row Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERCOLPCT_RESPONSES_COUNT, "LAYERCOLPCT.RESPONSES.COUNT", N_("Layer Column Responses % (Base: Count)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_ROWPCT_COUNT_RESPONSES, "ROWPCT.COUNT.RESPONSES", N_("Row Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_COLPCT_COUNT_RESPONSES, "COLPCT.COUNT.RESPONSES", N_("Column Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_TABLEPCT_COUNT_RESPONSES, "TABLEPCT.COUNT.RESPONSES", N_("Table Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_SUBTABLEPCT_COUNT_RESPONSES, "SUBTABLEPCT.COUNT.RESPONSES", N_("Subtable Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERPCT_COUNT_RESPONSES, "LAYERPCT.COUNT.RESPONSES", N_("Layer Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERROWPCT_COUNT_RESPONSES, "LAYERROWPCT.COUNT.RESPONSES", N_("Layer Row Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS) \
+ S(CTSF_LAYERCOLPCT_COUNT_RESPONSES, "LAYERCOLPCT.RESPONSES.COUNT", N_("Layer Column Count % (Base: Responses)"), CTF_PERCENT, CTFA_MRSETS)
+
+enum ctables_summary_function
+ {
+#define S(ENUM, NAME, LABEL, FORMAT, AVAILABILITY) ENUM,
+ SUMMARIES
+#undef S
+ };
+
+enum {
+#define S(ENUM, NAME, LABEL, FORMAT, AVAILABILITY) +1
+ N_CTSF_FUNCTIONS = SUMMARIES
+#undef S
+};
+
struct ctables
{
struct pivot_table_look *look;
enum ctables_label_position row_labels;
enum ctables_label_position col_labels;
- /* XXX CATEGORIES */
+ /* Indexed by variable dictionary index. */
+ struct ctables_categories **categories;
+ size_t n_categories;
double cilevel;
struct ctables_pairwise *pairwise;
};
+struct ctables_var
+ {
+ bool is_mrset;
+ union
+ {
+ struct variable *var;
+ const struct mrset *mrset;
+ };
+ };
+
+static const struct fmt_spec *
+ctables_var_get_print_format (const struct ctables_var *var)
+{
+ return (var->is_mrset
+ ? var_get_print_format (var->mrset->vars[0])
+ : var_get_print_format (var->var));
+}
+
+struct ctables_categories
+ {
+ size_t n_refs;
+
+ /* Explicit categories. */
+ struct ctables_cat_value *values;
+ size_t n_values;
+
+ /* Implicit categories. */
+ bool sort_ascending;
+ bool include_missing;
+ enum { CTCS_VALUE, CTCS_LABEL, CTCS_FUNCTION } key;
+ enum ctables_summary_function sort_func;
+ struct variable *sort_func_var;
+ double percentile;
+
+ /* Totals. */
+ bool show_totals;
+ bool totals_before;
+ char *total_label;
+
+ /* Empty categories. */
+ bool show_empty;
+ };
+
+struct ctables_cat_value
+ {
+ enum ctables_cat_value_type
+ {
+ CCVT_NUMBER,
+ CCVT_STRING,
+ CCVT_RANGE,
+ CCVT_MISSING,
+ CCVT_OTHERNM,
+ CCVT_SUBTOTAL,
+ CCVT_HSUBTOTAL,
+ }
+ type;
+
+ union
+ {
+ double number; /* CCVT_NUMBER. */
+ char *string; /* CCVT_STRING. */
+ double range[2]; /* CCVT_RANGE. */
+ char *subtotal_label; /* CCVT_SUBTOTAL, CCVT_HSUBTOTAL. */
+ };
+ };
+
+static void
+ctables_cat_value_uninit (struct ctables_cat_value *cv)
+{
+ if (!cv)
+ return;
+
+ switch (cv->type)
+ {
+ case CCVT_NUMBER:
+ case CCVT_RANGE:
+ case CCVT_MISSING:
+ case CCVT_OTHERNM:
+ break;
+
+ case CCVT_STRING:
+ free (cv->string);
+ break;
+
+ case CCVT_SUBTOTAL:
+ case CCVT_HSUBTOTAL:
+ free (cv->subtotal_label);
+ }
+}
+
+static void
+ctables_categories_unref (struct ctables_categories *c)
+{
+ if (!c)
+ return;
+
+ assert (c->n_refs > 0);
+ if (--c->n_refs)
+ return;
+
+ for (size_t i = 0; i < c->n_values; i++)
+ ctables_cat_value_uninit (&c->values[i]);
+ free (c->values);
+ free (c->total_label);
+ free (c);
+}
+
/* Chi-square test (SIGTEST). */
struct ctables_chisq
{
{
/* Terminals. */
CTAO_VAR,
- CTAO_MRSET,
/* Nonterminals. */
CTAO_STACK, /* + */
/* Terminals. */
struct
{
- union
- {
- struct variable *var;
- const struct mrset *mrset;
- };
-
+ struct ctables_var var;
bool scale;
struct ctables_summary *summaries;
size_t n_summaries;
CTF_GENERAL
};
-#define SUMMARIES \
- /* All variables. */ \
- S(CTSF_COUNT, "COUNT", N_("Count"), CTF_COUNT) \
- S(CTSF_ECOUNT, "ECOUNT", N_("Adjusted Count"), CTF_COUNT) \
- S(CTSF_ROWPCT_COUNT, "ROWPCT.COUNT", N_("Row %"), CTF_PERCENT) \
- S(CTSF_COLPCT_COUNT, "COLPCT.COUNT", N_("Column %"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_COUNT, "TABLEPCT.COUNT", N_("Table %"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_COUNT, "SUBTABLEPCT.COUNT", N_("Subtable %"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_COUNT, "LAYERPCT.COUNT", N_("Layer %"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_COUNT, "LAYERROWPCT.COUNT", N_("Layer Row %"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_COUNT, "LAYERCOLPCT.COUNT", N_("Layer Column %"), CTF_PERCENT) \
- S(CTSF_ROWPCT_VALIDN, "ROWPCT.VALIDN", N_("Row Valid N %"), CTF_PERCENT) \
- S(CTSF_COLPCT_VALIDN, "COLPCT.VALIDN", N_("Column Valid N %"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_VALIDN, "TABLEPCT.VALIDN", N_("Table Valid N %"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_VALIDN, "SUBTABLEPCT.VALIDN", N_("Subtable Valid N %"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_VALIDN, "LAYERPCT.VALIDN", N_("Layer Valid N %"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_VALIDN, "LAYERROWPCT.VALIDN", N_("Layer Row Valid N %"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_VALIDN, "LAYERCOLPCT.VALIDN", N_("Layer Column Valid N %"), CTF_PERCENT) \
- S(CTSF_ROWPCT_TOTALN, "ROWPCT.TOTALN", N_("Row Total N %"), CTF_PERCENT) \
- S(CTSF_COLPCT_TOTALN, "COLPCT.TOTALN", N_("Column Total N %"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_TOTALN, "TABLEPCT.TOTALN", N_("Table Total N %"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_TOTALN, "SUBTABLEPCT.TOTALN", N_("Subtable Total N %"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_TOTALN, "LAYERPCT.TOTALN", N_("Layer Total N %"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_TOTALN, "LAYERROWPCT.TOTALN", N_("Layer Row Total N %"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_TOTALN, "LAYERCOLPCT.TOTALN", N_("Layer Column Total N %"), CTF_PERCENT) \
- \
- /* Scale variables, totals, and subtotals. */ \
- S(CTSF_MAXIMUM, "MAXIMUM", N_("Maximum"), CTF_GENERAL) \
- S(CTSF_MEAN, "MEAN", N_("Mean"), CTF_GENERAL) \
- S(CTSF_MEDIAN, "MEDIAN", N_("Median"), CTF_GENERAL) \
- S(CTSF_MINIMUM, "MINIMUM", N_("Minimum"), CTF_GENERAL) \
- S(CTSF_MISSING, "MISSING", N_("Missing"), CTF_GENERAL) \
- S(CTSF_MODE, "MODE", N_("Mode"), CTF_GENERAL) \
- S(CTSF_PTILE, "PTILE", N_("Percentile"), CTF_GENERAL) \
- S(CTSF_RANGE, "RANGE", N_("Range"), CTF_GENERAL) \
- S(CTSF_SEMEAN, "SEMEAN", N_("Std Error of Mean"), CTF_GENERAL) \
- S(CTSF_STDDEV, "STDDEV", N_("Std Deviation"), CTF_GENERAL) \
- S(CTSF_SUM, "SUM", N_("Sum"), CTF_GENERAL) \
- S(CSTF_TOTALN, "TOTALN", N_("Total N"), CTF_COUNT) \
- S(CTSF_ETOTALN, "ETOTALN", N_("Adjusted Total N"), CTF_COUNT) \
- S(CTSF_VALIDN, "VALIDN", N_("Valid N"), CTF_COUNT) \
- S(CTSF_EVALIDN, "EVALIDN", N_("Adjusted Valid N"), CTF_COUNT) \
- S(CTSF_VARIANCE, "VARIANCE", N_("Variance"), CTF_GENERAL) \
- S(CTSF_ROWPCT_SUM, "ROWPCT.SUM", N_("Row Sum %"), CTF_PERCENT) \
- S(CTSF_COLPCT_SUM, "COLPCT.SUM", N_("Column Sum %"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_SUM, "TABLEPCT.SUM", N_("Table Sum %"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_SUM, "SUBTABLEPCT.SUM", N_("Subtable Sum %"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_SUM, "LAYERPCT.SUM", N_("Layer Sum %"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_SUM, "LAYERROWPCT.SUM", N_("Layer Row Sum %"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_SUM, "LAYERCOLPCT.SUM", N_("Layer Column Sum %"), CTF_PERCENT) \
- \
- /* Multiple response sets. */ \
- S(CTSF_RESPONSES, "RESPONSES", N_("Responses"), CTF_COUNT) \
- S(CTSF_ROWPCT_RESPONSES, "ROWPCT.RESPONSES", N_("Row Responses %"), CTF_PERCENT) \
- S(CTSF_COLPCT_RESPONSES, "COLPCT.RESPONSES", N_("Column Responses %"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_RESPONSES, "TABLEPCT.RESPONSES", N_("Table Responses %"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_RESPONSES, "SUBTABLEPCT.RESPONSES", N_("Subtable Responses %"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_RESPONSES, "LAYERPCT.RESPONSES", N_("Layer Responses %"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_RESPONSES, "LAYERROWPCT.RESPONSES", N_("Layer Row Responses %"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_RESPONSES, "LAYERCOLPCT.RESPONSES", N_("Layer Column Responses %"), CTF_PERCENT) \
- S(CTSF_ROWPCT_RESPONSES_COUNT, "ROWPCT.RESPONSES.COUNT", N_("Row Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_COLPCT_RESPONSES_COUNT, "COLPCT.RESPONSES.COUNT", N_("Column Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_RESPONSES_COUNT, "TABLEPCT.RESPONSES.COUNT", N_("Table Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_RESPONSES_COUNT, "SUBTABLEPCT.RESPONSES.COUNT", N_("Subtable Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_RESPONSES_COUNT, "LAYERPCT.RESPONSES.COUNT", N_("Layer Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_RESPONSES_COUNT, "LAYERROWPCT.RESPONSES.COUNT", N_("Layer Row Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_RESPONSES_COUNT, "LAYERCOLPCT.RESPONSES.COUNT", N_("Layer Column Responses % (Base: Count)"), CTF_PERCENT) \
- S(CTSF_ROWPCT_COUNT_RESPONSES, "ROWPCT.COUNT.RESPONSES", N_("Row Count % (Base: Responses)"), CTF_PERCENT) \
- S(CTSF_COLPCT_COUNT_RESPONSES, "COLPCT.COUNT.RESPONSES", N_("Column Count % (Base: Responses)"), CTF_PERCENT) \
- S(CTSF_TABLEPCT_COUNT_RESPONSES, "TABLEPCT.COUNT.RESPONSES", N_("Table Count % (Base: Responses)"), CTF_PERCENT) \
- S(CTSF_SUBTABLEPCT_COUNT_RESPONSES, "SUBTABLEPCT.COUNT.RESPONSES", N_("Subtable Count % (Base: Responses)"), CTF_PERCENT) \
- S(CTSF_LAYERPCT_COUNT_RESPONSES, "LAYERPCT.COUNT.RESPONSES", N_("Layer Count % (Base: Responses)"), CTF_PERCENT) \
- S(CTSF_LAYERROWPCT_COUNT_RESPONSES, "LAYERROWPCT.COUNT.RESPONSES", N_("Layer Row Count % (Base: Responses)"), CTF_PERCENT) \
- S(CTSF_LAYERCOLPCT_COUNT_RESPONSES, "LAYERCOLPCT.RESPONSES.COUNT", N_("Layer Column Count % (Base: Responses)"), CTF_PERCENT)
-
-enum ctables_summary_function
+enum ctables_function_availability
{
-#define S(ENUM, NAME, LABEL, FORMAT) ENUM,
- SUMMARIES
-#undef S
+ CTFA_ALL, /* Any variables. */
+ CTFA_SCALE, /* Only scale variables, totals, and subtotals. */
+ CTFA_MRSETS, /* Only multiple-response sets */
};
-enum {
-#define S(ENUM, NAME, LABEL, FORMAT) +1
- N_CTSF_FUNCTIONS = SUMMARIES
-#undef S
-};
-
struct ctables_summary
{
enum ctables_summary_function function;
return true;
}
+static enum ctables_function_availability
+ctables_function_availability (enum ctables_summary_function f)
+{
+ static enum ctables_function_availability availability[] = {
+#define S(ENUM, NAME, LABEL, FORMAT, AVAILABILITY) [ENUM] = AVAILABILITY,
+ SUMMARIES
+#undef S
+ };
+
+ return availability[f];
+}
+
static bool
parse_ctables_summary_function (struct lexer *lexer,
enum ctables_summary_function *f)
struct substring name;
};
static struct pair names[] = {
-#define S(ENUM, NAME, LABEL, FORMAT) { ENUM, SS_LITERAL_INITIALIZER (NAME) },
+#define S(ENUM, NAME, LABEL, FORMAT, AVAILABILITY) \
+ { ENUM, SS_LITERAL_INITIALIZER (NAME) },
SUMMARIES
/* The .COUNT suffix may be omitted. */
- S(CTSF_ROWPCT_COUNT, "ROWPCT", _, _)
- S(CTSF_COLPCT_COUNT, "COLPCT", _, _)
- S(CTSF_TABLEPCT_COUNT, "TABLEPCT", _, _)
- S(CTSF_SUBTABLEPCT_COUNT, "SUBTABLEPCT", _, _)
- S(CTSF_LAYERPCT_COUNT, "LAYERPCT", _, _)
- S(CTSF_LAYERROWPCT_COUNT, "LAYERROWPCT", _, _)
- S(CTSF_LAYERCOLPCT_COUNT, "LAYERCOLPCT", _, _)
+ S(CTSF_ROWPCT_COUNT, "ROWPCT", _, _, _)
+ S(CTSF_COLPCT_COUNT, "COLPCT", _, _, _)
+ S(CTSF_TABLEPCT_COUNT, "TABLEPCT", _, _, _)
+ S(CTSF_SUBTABLEPCT_COUNT, "SUBTABLEPCT", _, _, _)
+ S(CTSF_LAYERPCT_COUNT, "LAYERPCT", _, _, _)
+ S(CTSF_LAYERROWPCT_COUNT, "LAYERROWPCT", _, _, _)
+ S(CTSF_LAYERCOLPCT_COUNT, "LAYERCOLPCT", _, _, _)
#undef S
};
switch (axis->op)
{
case CTAO_VAR:
- case CTAO_MRSET:
for (size_t i = 0; i < axis->n_summaries; i++)
ctables_summary_uninit (&axis->summaries[i]);
free (axis->summaries);
sizeof *axis->summaries);
static const char *default_labels[] = {
-#define S(ENUM, NAME, LABEL, FORMAT) [ENUM] = LABEL,
+#define S(ENUM, NAME, LABEL, FORMAT, AVAILABILITY) [ENUM] = LABEL,
SUMMARIES
#undef S
};
: xstrdup (gettext (default_labels[function])));
static const enum ctables_format default_formats[] = {
-#define S(ENUM, NAME, LABEL, FORMAT) [ENUM] = FORMAT,
+#define S(ENUM, NAME, LABEL, FORMAT, AVAILABILITY) [ENUM] = FORMAT,
SUMMARIES
#undef S
};
break;
case CTF_GENERAL:
- format = *(axis->op == CTAO_VAR
- ? var_get_print_format (axis->var)
- : var_get_print_format (axis->mrset->vars[0]));
+ format = *ctables_var_get_print_format (&axis->var);
break;
default:
static struct ctables_axis *ctables_axis_parse_stack (
struct ctables_axis_parse_ctx *);
+static bool
+ctables_var_parse (struct lexer *lexer, struct dictionary *dict,
+ struct ctables_var *var)
+{
+ if (ss_starts_with (lex_tokss (lexer), ss_cstr ("$")))
+ {
+ *var = (struct ctables_var) {
+ .is_mrset = true,
+ .mrset = dict_lookup_mrset (dict, lex_tokcstr (lexer))
+ };
+ if (!var->mrset)
+ {
+ lex_error (lexer, _("'%s' does not name a multiple-response set "
+ "in the active file dictionary."),
+ lex_tokcstr (lexer));
+ return false;
+ }
+ lex_get (lexer);
+ return true;
+ }
+ else
+ {
+ *var = (struct ctables_var) {
+ .is_mrset = false,
+ .var = parse_variable (lexer, dict),
+ };
+ return var->var != NULL;
+ }
+}
+
static struct ctables_axis *
ctables_axis_parse_primary (struct ctables_axis_parse_ctx *ctx)
{
if (!lex_force_id (ctx->lexer))
return NULL;
- const struct mrset *mrset = NULL;
- struct variable *var = NULL;
- if (ss_starts_with (lex_tokss (ctx->lexer), ss_cstr ("$")))
- {
- mrset = dict_lookup_mrset (ctx->dict, lex_tokcstr (ctx->lexer));
- if (!mrset)
- {
- lex_error (ctx->lexer, _("'%s' is not the name of a "
- "multiple-response set in the active file "
- "dictionary."),
- lex_tokcstr (ctx->lexer));
- return NULL;
- }
- lex_get (ctx->lexer);
- }
- else
- {
- var = parse_variable (ctx->lexer, ctx->dict);
- if (!var)
- return NULL;
- }
+ struct ctables_var var;
+ if (!ctables_var_parse (ctx->lexer, ctx->dict, &var))
+ return NULL;
struct ctables_axis *axis = xmalloc (sizeof *axis);
- if (mrset)
- *axis = (struct ctables_axis) { .op = CTAO_MRSET, .mrset = mrset };
- else
- *axis = (struct ctables_axis) { .op = CTAO_VAR, .var = var };
+ *axis = (struct ctables_axis) { .op = CTAO_VAR, .var = var };
/* XXX should figure out default measures by reading data */
- axis->scale = (mrset ? false
+ axis->scale = (var.is_mrset ? false
: lex_match_phrase (ctx->lexer, "[S]") ? true
: lex_match_phrase (ctx->lexer, "[C]") ? false
- : var_get_measure (var) == MEASURE_SCALE);
+ : var_get_measure (var.var) == MEASURE_SCALE);
size_t allocated_summaries = 0;
if (lex_match (ctx->lexer, T_LBRACK))
if (!t)
return;
+ for (size_t i = 0; i < t->n_categories; i++)
+ ctables_categories_unref (t->categories[i]);
+ free (t->categories);
+
ctables_axis_destroy (t->axes[PIVOT_AXIS_COLUMN]);
ctables_axis_destroy (t->axes[PIVOT_AXIS_ROW]);
ctables_axis_destroy (t->axes[PIVOT_AXIS_LAYER]);
free (ct);
}
+static struct ctables_cat_value
+ccvt_range (double low, double high)
+{
+ return (struct ctables_cat_value) {
+ .type = CCVT_RANGE,
+ .range = { low, high }
+ };
+}
+
+static bool
+ctables_table_parse_categories (struct lexer *lexer, struct dictionary *dict,
+ struct ctables_table *t)
+{
+ if (!lex_match_id (lexer, "VARIABLES"))
+ return false;
+ lex_match (lexer, T_EQUALS);
+
+ struct variable **vars;
+ size_t n_vars;
+ if (!parse_variables (lexer, dict, &vars, &n_vars, PV_NO_SCRATCH))
+ return false;
+
+ struct ctables_categories *c = xmalloc (sizeof *c);
+ *c = (struct ctables_categories) { .n_refs = n_vars };
+ for (size_t i = 0; i < n_vars; i++)
+ {
+ struct ctables_categories **cp
+ = &t->categories[var_get_dict_index (vars[i])];
+ ctables_categories_unref (*cp);
+ *cp = c;
+ }
+ free (vars);
+
+ if (lex_match (lexer, T_LBRACK))
+ {
+ size_t allocated_values = 0;
+ do
+ {
+ if (c->n_values >= allocated_values)
+ c->values = x2nrealloc (c->values, &allocated_values,
+ sizeof *c->values);
+
+ struct ctables_cat_value *v = &c->values[c->n_values];
+ if (lex_match_id (lexer, "OTHERNM"))
+ v->type = CCVT_OTHERNM;
+ else if (lex_match_id (lexer, "MISSING"))
+ v->type = CCVT_MISSING;
+ else if (lex_match_id (lexer, "SUBTOTAL"))
+ *v = (struct ctables_cat_value)
+ { .type = CCVT_SUBTOTAL, .subtotal_label = NULL };
+ else if (lex_match_id (lexer, "HSUBTOTAL"))
+ *v = (struct ctables_cat_value)
+ { .type = CCVT_HSUBTOTAL, .subtotal_label = NULL };
+ else if (lex_match_id (lexer, "LO"))
+ {
+ if (!lex_force_match_id (lexer, "THRU") || lex_force_num (lexer))
+ return false;
+ *v = ccvt_range (-DBL_MAX, lex_number (lexer));
+ lex_get (lexer);
+ }
+ else if (lex_is_number (lexer))
+ {
+ double number = lex_number (lexer);
+ lex_get (lexer);
+ if (lex_match_id (lexer, "THRU"))
+ {
+ v->type = CCVT_RANGE;
+ v->range[0] = number;
+ if (lex_match_id (lexer, "HI"))
+ *v = ccvt_range (number, DBL_MAX);
+ else
+ {
+ if (!lex_force_num (lexer))
+ return false;
+ *v = ccvt_range (number, lex_number (lexer));
+ lex_get (lexer);
+ }
+ }
+ else
+ *v = (struct ctables_cat_value) {
+ .type = CCVT_NUMBER,
+ .number = number
+ };
+ }
+ else if (lex_is_string (lexer))
+ {
+ *v = (struct ctables_cat_value) {
+ .type = CCVT_STRING,
+ .string = ss_xstrdup (lex_tokss (lexer)),
+ };
+ lex_get (lexer);
+ }
+ else
+ {
+ lex_error (lexer, NULL);
+ return false;
+ }
+
+ if ((v->type == CCVT_SUBTOTAL || v->type == CCVT_HSUBTOTAL)
+ && lex_match (lexer, T_EQUALS))
+ {
+ if (!lex_force_string (lexer))
+ return false;
+
+ v->subtotal_label = ss_xstrdup (lex_tokss (lexer));
+ lex_get (lexer);
+ }
+
+ c->n_values++;
+ lex_match (lexer, T_COMMA);
+ }
+ while (!lex_match (lexer, T_RBRACK));
+ }
+
+ while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
+ {
+ if (!c->n_values && lex_match_id (lexer, "ORDER"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (lex_match_id (lexer, "A"))
+ c->sort_ascending = true;
+ else if (lex_match_id (lexer, "D"))
+ c->sort_ascending = false;
+ else
+ {
+ lex_error_expecting (lexer, "A", "D");
+ return false;
+ }
+ }
+ else if (!c->n_values && lex_match_id (lexer, "KEY"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (lex_match_id (lexer, "VALUE"))
+ c->key = CTCS_VALUE;
+ else if (lex_match_id (lexer, "LABEL"))
+ c->key = CTCS_LABEL;
+ else
+ {
+ c->key = CTCS_FUNCTION;
+ if (!parse_ctables_summary_function (lexer, &c->sort_func))
+ return false;
+
+ if (lex_match (lexer, T_LPAREN))
+ {
+ c->sort_func_var = parse_variable (lexer, dict);
+ if (!c->sort_func_var)
+ return false;
+
+ if (c->sort_func == CTSF_PTILE)
+ {
+ lex_match (lexer, T_COMMA);
+ if (!lex_force_num_range_closed (lexer, "PTILE", 0, 100))
+ return false;
+ c->percentile = lex_number (lexer);
+ lex_get (lexer);
+ }
+
+ if (!lex_force_match (lexer, T_RPAREN))
+ return false;
+ }
+ else if (ctables_function_availability (c->sort_func)
+ == CTFA_SCALE)
+ {
+ bool UNUSED b = lex_force_match (lexer, T_LPAREN);
+ return false;
+ }
+ }
+ }
+ else if (!c->n_values && lex_match_id (lexer, "MISSING"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (lex_match_id (lexer, "INCLUDE"))
+ c->include_missing = true;
+ else if (lex_match_id (lexer, "EXCLUDE"))
+ c->include_missing = false;
+ else
+ {
+ lex_error_expecting (lexer, "INCLUDE", "EXCLUDE");
+ return false;
+ }
+ }
+ else if (lex_match_id (lexer, "TOTAL"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!parse_bool (lexer, &c->show_totals))
+ return false;
+ }
+ else if (lex_match_id (lexer, "LABEL"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_string (lexer))
+ return false;
+ free (c->total_label);
+ c->total_label = ss_xstrdup (lex_tokss (lexer));
+ lex_get (lexer);
+ }
+ else if (lex_match_id (lexer, "POSITION"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (lex_match_id (lexer, "BEFORE"))
+ c->totals_before = true;
+ else if (lex_match_id (lexer, "AFTER"))
+ c->totals_before = false;
+ else
+ {
+ lex_error_expecting (lexer, "BEFORE", "AFTER");
+ return false;
+ }
+ }
+ else if (lex_match_id (lexer, "EMPTY"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (lex_match_id (lexer, "INCLUDE"))
+ c->show_empty = true;
+ else if (lex_match_id (lexer, "EXCLUDE"))
+ c->show_empty = false;
+ else
+ {
+ lex_error_expecting (lexer, "INCLUDE", "EXCLUDE");
+ return false;
+ }
+ }
+ else
+ {
+ if (!c->n_values)
+ lex_error_expecting (lexer, "ORDER", "KEY", "MISSING",
+ "TOTAL", "LABEL", "POSITION", "EMPTY");
+ else
+ lex_error_expecting (lexer, "TOTAL", "LABEL", "POSITION", "EMPTY");
+ return false;
+ }
+ }
+ return true;
+}
+
int
cmd_ctables (struct lexer *lexer, struct dataset *ds)
{
.slabels_visible = true,
.row_labels = CTLP_NORMAL,
.col_labels = CTLP_NORMAL,
+ .categories = xcalloc (dict_get_n_vars (dataset_dict (ds)),
+ sizeof *t->categories),
+ .n_categories = dict_get_n_vars (dataset_dict (ds)),
.cilevel = 95,
};
t->cilevel = lex_number (lexer);
lex_get (lexer);
}
+ else if (lex_match_id (lexer, "CATEGORIES"))
+ {
+ if (!ctables_table_parse_categories (lexer, dataset_dict (ds), t))
+ goto error;
+ }
else if (lex_match_id (lexer, "TITLES"))
{
do
projects / pspp / commitdiff