simplify weighting

[pspp] / src / language / stats / ctables.inc

diff --git a/src/language/stats/ctables.inc b/src/language/stats/ctables.inc
index 1a418fe03d43b98d0d5ec6641b708385a05296e5..27160997e0960f17c2f3efbd8eeddba347c030ab 100644 (file)
--- a/src/language/stats/ctables.inc
+++ b/src/language/stats/ctables.inc
@@ -1,30 +1,27 @@
 /* -*- c -*- */
 
 /* Summary functions for all variables. */
-S(CTSF_COUNT,          "COUNT",      CTFT_UCELL, CTF_COUNT,   CTFA_ALL)
-S(CTSF_ECOUNT,         "ECOUNT",     CTFT_CELL,  CTF_COUNT,   CTFA_ALL)
-S(CTSF_areaPCT_COUNT,  "PCT.COUNT",  CTFT_AREA,  CTF_PERCENT, CTFA_ALL)
-S(CTSF_areaPCT_VALIDN, "PCT.VALIDN", CTFT_AREA,  CTF_PERCENT, CTFA_ALL)
-S(CTSF_areaPCT_TOTALN, "PCT.TOTALN", CTFT_AREA,  CTF_PERCENT, CTFA_ALL)
+S(CTSF_COUNT,          "COUNT",      CTFT_UECELL, CTF_COUNT,   CTFA_ALL)
+S(CTSF_areaPCT_COUNT,  "PCT.COUNT",  CTFT_AREA,   CTF_PERCENT, CTFA_ALL)
+S(CTSF_areaPCT_VALIDN, "PCT.VALIDN", CTFT_AREA,   CTF_PERCENT, CTFA_ALL)
+S(CTSF_areaPCT_TOTALN, "PCT.TOTALN", CTFT_AREA,   CTF_PERCENT, CTFA_ALL)
 
 /* Scale variables, totals, and subtotals. */
-S(CTSF_MAXIMUM,        "MAXIMUM",    CTFT_CELL,  CTF_GENERAL, CTFA_SCALE)
-S(CTSF_MEAN,           "MEAN",       CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_MEDIAN,         "MEDIAN",     CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_MINIMUM,        "MINIMUM",    CTFT_CELL,  CTF_GENERAL, CTFA_SCALE)
-S(CTSF_MISSING,        "MISSING",    CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_MODE,           "MODE",       CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_PTILE,          "PTILE",      CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_RANGE,          "RANGE",      CTFT_CELL,  CTF_GENERAL, CTFA_SCALE)
-S(CTSF_SEMEAN,         "SEMEAN",     CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_STDDEV,         "STDDEV",     CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_SUM,            "SUM",        CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_TOTALN,         "TOTALN",     CTFT_UCELL, CTF_COUNT,   CTFA_SCALE)
-S(CTSF_ETOTALN,        "ETOTALN",    CTFT_CELL,  CTF_COUNT,   CTFA_SCALE)
-S(CTSF_VALIDN,         "VALIDN",     CTFT_UCELL, CTF_COUNT,   CTFA_SCALE)
-S(CTSF_EVALIDN,        "EVALIDN",    CTFT_CELL,  CTF_COUNT,   CTFA_SCALE)
-S(CTSF_VARIANCE,       "VARIANCE",   CTFT_UCELL, CTF_GENERAL, CTFA_SCALE)
-S(CTSF_areaPCT_SUM,    "PCT.SUM",    CTFT_AREA,  CTF_PERCENT, CTFA_SCALE)
+S(CTSF_MAXIMUM,        "MAXIMUM",    CTFT_CELL,   CTF_GENERAL, CTFA_SCALE)
+S(CTSF_MEAN,           "MEAN",       CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_MEDIAN,         "MEDIAN",     CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_MINIMUM,        "MINIMUM",    CTFT_CELL,   CTF_GENERAL, CTFA_SCALE)
+S(CTSF_MISSING,        "MISSING",    CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_MODE,           "MODE",       CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_PTILE,          "PTILE",      CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_RANGE,          "RANGE",      CTFT_CELL,   CTF_GENERAL, CTFA_SCALE)
+S(CTSF_SEMEAN,         "SEMEAN",     CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_STDDEV,         "STDDEV",     CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_SUM,            "SUM",        CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_TOTALN,         "TOTALN",     CTFT_UECELL, CTF_COUNT,   CTFA_SCALE)
+S(CTSF_VALIDN,         "VALIDN",     CTFT_UECELL, CTF_COUNT,   CTFA_SCALE)
+S(CTSF_VARIANCE,       "VARIANCE",   CTFT_UCELL,  CTF_GENERAL, CTFA_SCALE)
+S(CTSF_areaPCT_SUM,    "PCT.SUM",    CTFT_AREA,   CTF_PERCENT, CTFA_SCALE)
 
 /* Debugging and troubleshooting. */
-S(CTSF_areaID,         "ID",         CTFT_AREA,  CTF_COUNT,   CTFA_ALL)
+S(CTSF_areaID,         "ID",         CTFT_AREA,   CTF_COUNT,   CTFA_ALL)