X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fstatistics.texi;h=8445b51b099e077155ccac80cc90902fa6725098;hb=refs%2Fheads%2Fctables7;hp=18f3d73e8e850b3ee12ef91dea9752add37a98d0;hpb=851edb461d234263f56c36ad5b329cccd8c26c55;p=pspp

diff --git a/doc/statistics.texi b/doc/statistics.texi
index 18f3d73e8e..8445b51b09 100644
--- a/doc/statistics.texi
+++ b/doc/statistics.texi
@@ -1194,9 +1194,13 @@ The following sections list the available summary functions.
 
 This section lists the summary functions that can be applied to cells
 in @code{CTABLES}.  Many of these functions have an @var{area} in
-their names.  Some @var{area}s correspond to parts of @dfn{subtables},
-whose contents are the cells that pair an innermost row variable and
-an innermost column variable:
+their names.  The supported areas are:
+
+@itemize @bullet
+@item
+Areas that correspond to parts of @dfn{subtables}, whose contents are
+the cells that pair an innermost row variable and an innermost column
+variable:
 
 @table @code
 @item ROW
@@ -1209,7 +1213,8 @@ A column within a subtable.
 All the cells in a subtable
 @end table
 
-Other areas correspond to parts of @dfn{sections}, where stacked
+@item
+Areas that correspond to parts of @dfn{sections}, where stacked
 variables divide each section from another:
 
 @table @code
@@ -1225,82 +1230,108 @@ A row in one layer within a section.
 @item LAYERCOL
 A column in one layer within a section.
 @end table
+@end itemize
 
-The following summary functions may be applied to any variable
-regardless of whether it is categorical or scalar.
+The following table lists summary functions that may be applied to any
+variable regardless of whether it is categorical or scalar, along with
+their default labels:
 
 @table @asis
-@item @code{COUNT}
-@itemx @code{ECOUNT}
-The sum of weights in a cell (the number of cases, for an unweighted
-dataset).  For @code{ECOUNT}, if the @code{WEIGHT} subcommand
-specified an adjustment weight variable, its sum is used.
+@item @code{COUNT} (``Count'')
+The sum of weights in a cell.
 
-@item @i{area}@code{PCT} or @i{area}@code{PCT.COUNT}
+@item @i{area}@code{PCT} or @i{area}@code{PCT.COUNT} (``@i{Area} %'')
 A percentage within the specified @var{area}.
 
-@item @i{area}@code{PCT.VALIDN}
+@item @i{area}@code{PCT.VALIDN} (``@i{Area} Valid N %'')
 A percentage of valid values within the specified @var{area}.
 
-@item @i{area}@code{PCT.TOTALN}
+@item @i{area}@code{PCT.TOTALN} (``@i{Area} Total N %'')
 A percentage of total values within the specified @var{area}.
 @end table
 
-The following summary functions apply only to scale variables:
+The following table lists summary functions that apply only to scale
+variables:
 
 @table @asis
-@item @code{MAXIMUM}
+@item @code{MAXIMUM} (``Maximum'')
 The largest value.
 
-@item @code{MEAN}
+@item @code{MEAN} (``Mean'')
 The mean.
 
-@item @code{MEDIAN}
+@item @code{MEDIAN} (``Median'')
 The median value.
 
-@item @code{MINIMUM}
+@item @code{MINIMUM} (``Minimum'')
 The smallest value.
 
-@item @code{MISSING}
+@item @code{MISSING} (``Missing'')
 Sum of weights of user- and system-missing values.
 
-@item @code{MODE}
+@item @code{MODE} (``Mode'')
 The highest-frequency value.  Ties are broken by taking the smallest mode.
 
-@item @i{area}@code{PCT.SUM}
+@item @i{area}@code{PCT.SUM} (``@i{Area} Sum %'')
 Percentage of the sum of the values across @var{area}.
 
-@item @code{PTILE} @i{n}
+@item @code{PTILE} @i{n} (``Percentile @i{n}'')
 The @var{n}th percentile, where @math{0 @leq{} @var{n} @leq{} 100}.
 
-@item @code{RANGE}
+@item @code{RANGE} (``Range'')
 The maximum minus the minimum.
 
-@item @code{SEMEAN}
+@item @code{SEMEAN} (``Std Error of Mean'')
 The standard error of the mean.
 
-@item @code{STDDEV}
+@item @code{STDDEV} (``Std Deviation'')
 The standard deviation.
 
-@item @code{SUM}
+@item @code{SUM} (``Sum'')
 The sum.
 
-@item @code{TOTALN}
-@itemx @code{ETOTALN}
-The sum of total count weights.  For @code{ETOTALN}, if the
-@code{WEIGHT} subcommand specified an adjustment weight variable, its
-sum is used.
+@item @code{TOTALN} (``Total N'')
+The sum of total count weights.
 
-@item @code{VALIDN}
-@itemx @code{EVALIDN}
-The sum of valid count weights.  For @code{ETOTALN}, if the
-@code{WEIGHT} subcommand specified an adjustment weight variable, its
-sum is used.
+@item @code{VALIDN} (``Valid N'')
+The sum of valid count weights.
 
-@item @code{VARIANCE}
+@item @code{VARIANCE} (``Variance'')
 The variance.
 @end table
 
+If the @code{WEIGHT} subcommand specified an adjustment weight
+variable, then the following summary functions use its value instead
+of the dictionary weight variable.  Otherwise, they are equivalent to
+the summary function without the @samp{E}-prefix:
+
+@itemize @bullet
+@item @code{ECOUNT} (``Adjusted Count'')
+@item @code{ETOTALN} (``Adjusted Total N'')
+@item @code{EVALIDN} (``Adjusted Valid N'')
+@end itemize
+
+The following summary functions with a @samp{U}-prefix are equivalent
+to those without a prefix, except that they use unweighted counts:
+
+@itemize @bullet
+@item @code{UCOUNT} (``Unweighted Count'')
+@item @code{U}@i{area}@code{PCT} or @code{U}@i{area}@code{PCT.COUNT} (``Unweighted @i{Area} %'')
+@item @code{U}@i{area}@code{PCT.VALIDN} (``Unweighted @i{Area} Valid N %'')
+@item @code{U}@i{area}@code{PCT.TOTALN} (``Unweighted @i{Area} Total N %'')
+@item @code{UMEAN} (``Unweighted Mean'')
+@item @code{UMEDIAN} (``Unweighted Median'')
+@item @code{UMISSING} (``Unweighted Missing'')
+@item @code{UMODE} (``Unweight Mode'')
+@item @code{U}@i{area}@code{PCT.SUM} (``Unweighted @i{Area} Sum %'')
+@item @code{UPTILE} @i{n} (``Unweighted Percentile @i{n}'') 
+@item @code{USEMEAN} (``Unweighted Std Error of Mean'')
+@item @code{USTDDEV} (``Unweighted Std Deviation'')
+@item @code{USUM} (``Unweighted Sum'')
+@item @code{UTOTALN} (``Unweighted Total N'')
+@item @code{UVALIDN} (``Unweighted Valid N'')
+@item @code{UVARIANCE} (``Unweighted Variance'')
+@end itemize
 
 @node FACTOR, GLM, CTABLES, Statistics
 @section FACTOR