simplify weighting

[pspp] / tests / language / stats / ctables.at

diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at
index 960004e6f351c71f3e823ba531b6ea6394c3418b..67d6db4b263b97df81f8e819996b9b1a43deee8e 100644 (file)
--- a/tests/language/stats/ctables.at
+++ b/tests/language/stats/ctables.at
@@ -4985,7 +4985,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 │  Sum              │181.00│147.00│197.00│181.00│180.00│194.00│178.00│177.00│191.00│
 │  Count            │    10│    10│    10│    10│    10│    10│    10│    10│    10│
 │  Total N          │    10│    10│    10│    10│    10│    10│    10│    10│    10│
-│  Layer Row Sum %  │ 26.3%│ 21.3%│     .│ 26.3%│ 26.1%│     .│     .│     .│     .│
+│  Layer Row Sum %  │ 11.1%│  9.0%│ 12.1%│ 11.1%│ 11.1%│ 11.9%│ 10.9%│ 10.9%│ 11.7%│
 ╰───────────────────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────╯
 
                                   Statistics
@@ -5048,32 +5048,32 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 │  Sum              │1089.00│847.00│928.00│727.00│1034.00│939.00│806.00│815.00│1015.00│
 │  Count            │     46│    49│    52│    48│     51│    47│    50│    53│     49│
 │  Total N          │     46│    49│    52│    48│     51│    47│    50│    53│     49│
-│  Layer Row Sum %  │  29.5%│ 22.9%│     .│ 19.7%│  28.0%│     .│     .│     .│      .│
+│  Layer Row Sum %  │  13.3%│ 10.3%│ 11.3%│  8.9%│  12.6%│ 11.5%│  9.8%│  9.9%│  12.4%│
 ╰───────────────────┴───────┴──────┴──────┴──────┴───────┴──────┴──────┴──────┴───────╯
 
-                                        Custom Tables
-╭────────────────────────────┬──────────────────────────────────────────────────────────────╮
-│                            │                               a                              │
-│                            ├────────────────────┬────────────────────┬────────────────────┤
-│                            │          1         │          2         │          9         │
-│                            ├────────────────────┼────────────────────┼────────────────────┤
-│                            │          b         │          b         │          b         │
-│                            ├──────┬──────┬──────┼──────┬──────┬──────┼──────┬──────┬──────┤
-│                            │   3  │   4  │   9  │   3  │   4  │   9  │   3  │   4  │   9  │
-├────────────────────────────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│c Valid N                   │     7│     6│     8│     7│     7│     8│     7│     7│     8│
-│  Missing                   │     3│     4│     2│     3│     3│     2│     3│     3│     2│
-│  Unweighted Mean           │ 25.86│ 24.50│ 24.63│ 25.86│ 25.71│ 24.25│ 25.43│ 25.29│ 23.88│
-│  Std Error of Mean         │  2.44│  2.14│  2.58│  2.44│  2.18│  2.43│  2.36│  2.18│  2.47│
-│  Median                    │ 25.00│ 24.50│ 25.00│ 25.00│ 27.00│ 25.00│ 25.00│ 24.00│ 23.50│
-│  Mode                      │    16│    18│    15│    16│    18│    15│    16│    18│    15│
-│  Std Deviation             │  6.47│  5.24│  7.31│  6.47│  5.77│  6.88│  6.24│  5.77│  6.98│
-│  Variance                  │ 41.81│ 27.50│ 53.41│ 41.81│ 33.24│ 47.36│ 38.95│ 33.24│ 48.70│
-│  Sum                       │181.00│147.00│197.00│181.00│180.00│194.00│178.00│177.00│191.00│
-│  Unweighted Count          │    10│    10│    10│    10│    10│    10│    10│    10│    10│
-│  Total N                   │    10│    10│    10│    10│    10│    10│    10│    10│    10│
-│  Unweighted Layer Row Sum %│ 26.3%│ 21.3%│     .│ 26.3%│ 26.1%│     .│     .│     .│     .│
-╰────────────────────────────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────╯
+                                         Custom Tables
+â\95­â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¬â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\95®
+│                              │                               a                              │
+│                              ├────────────────────┬────────────────────┬────────────────────┤
+│                              │          1         │          2         │          9         │
+│                              ├────────────────────┼────────────────────┼────────────────────┤
+│                              │          b         │          b         │          b         │
+│                              ├──────┬──────┬──────┼──────┬──────┬──────┼──────┬──────┬──────┤
+│                              │   3  │   4  │   9  │   3  │   4  │   9  │   3  │   4  │   9  │
+â\94\9câ\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¼â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94¤
+│c Unweighted Valid N          │     7│     6│     8│     7│     7│     8│     7│     7│     8│
+│  Unweighted Missing          │     3│     4│     2│     3│     3│     2│     3│     3│     2│
+│  Unweighted Mean             │ 25.86│ 24.50│ 24.63│ 25.86│ 25.71│ 24.25│ 25.43│ 25.29│ 23.88│
+│  Unweighted Std Error of Mean│  2.44│  2.14│  2.58│  2.44│  2.18│  2.43│  2.36│  2.18│  2.47│
+│  Unweighted Median           │ 25.00│ 24.50│ 25.00│ 25.00│ 27.00│ 25.00│ 25.00│ 24.00│ 23.50│
+│  Unweighted Mode             │    16│    18│    15│    16│    18│    15│    16│    18│    15│
+│  Unweighted Std Deviation    │  6.47│  5.24│  7.31│  6.47│  5.77│  6.88│  6.24│  5.77│  6.98│
+│  Unweighted Variance         │ 41.81│ 27.50│ 53.41│ 41.81│ 33.24│ 47.36│ 38.95│ 33.24│ 48.70│
+│  Unweighted Sum              │181.00│147.00│197.00│181.00│180.00│194.00│178.00│177.00│191.00│
+│  Unweighted Count            │    10│    10│    10│    10│    10│    10│    10│    10│    10│
+│  Unweighted Total N          │    10│    10│    10│    10│    10│    10│    10│    10│    10│
+│  Unweighted Layer Row Sum %  │ 11.1%│  9.0%│ 12.1%│ 11.1%│ 11.1%│ 11.9%│ 10.9%│ 10.9%│ 11.7%│
+â\95°â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\94´â\94\80â\94\80â\94\80â\94\80â\94\80â\94\80â\95¯
 ])
 AT_CLEANUP