improve FREQUENCIES LAYERED

diff --git a/src/language/stats/frequencies.c b/src/language/stats/frequencies.c
index cf40446a77d5e944b8766594260d3500bf50e5e8..018cc6237e0e1c1f845c11c17c59a18df3bde015 100644 (file)
--- a/src/language/stats/frequencies.c
+++ b/src/language/stats/frequencies.c
@@ -1613,7 +1613,7 @@ frq_stats_table_create (const struct frq_proc *frq,
                                     pc->p * 100.0));
     }
 
-  struct pivot_splits *splits = pivot_splits_create (table, PIVOT_AXIS_ROW,
+  struct pivot_splits *splits = pivot_splits_create (table, PIVOT_AXIS_COLUMN,
                                                      dict);
 
   struct frq_stats_table *fst = xmalloc (sizeof *fst);

diff --git a/tests/language/stats/frequencies.at b/tests/language/stats/frequencies.at
index 6c85236b49b803f9ae303a26a1c0c96c247f9878..5ab31a5d9f4b1fee361448e52ddb64e38f71eb41 100644 (file)
--- a/tests/language/stats/frequencies.at
+++ b/tests/language/stats/frequencies.at
@@ -70,31 +70,15 @@ FREQUENCIES /VARIABLES=value quantity /FORMAT NOTABLE.
 ])
 AT_CHECK([pspp -O format=csv frequencies.sps], [0], [dnl
 Table: Statistics
-name,,,value,quantity
-bar,N,Valid,2,2
-,,Missing,0,0
-,Mean,,1.50,4.00
-,Std Dev,,.71,2.83
-,Minimum,,1.00,2.00
-,Maximum,,2.00,6.00
-baz,N,Valid,4,4
-,,Missing,0,0
-,Mean,,1.75,4.25
-,Std Dev,,1.50,3.40
-,Minimum,,1.00,1.00
-,Maximum,,4.00,9.00
-foo,N,Valid,2,2
-,,Missing,0,0
-,Mean,,3.50,2.50
-,Std Dev,,3.54,3.54
-,Minimum,,1.00,.00
-,Maximum,,6.00,5.00
-quux,N,Valid,2,2
-,,Missing,0,0
-,Mean,,4.00,4.50
-,Std Dev,,1.41,4.95
-,Minimum,,3.00,1.00
-,Maximum,,5.00,8.00
+,,name,,,,,,,
+,,bar,,baz,,foo,,quux,
+,,value,quantity,value,quantity,value,quantity,value,quantity
+N,Valid,2,2,4,4,2,2,2,2
+,Missing,0,0,0,0,0,0,0,0
+Mean,,1.50,4.00,1.75,4.25,3.50,2.50,4.00,4.50
+Std Dev,,.71,2.83,1.50,3.40,3.54,3.54,1.41,4.95
+Minimum,,1.00,2.00,1.00,1.00,1.00,.00,3.00,1.00
+Maximum,,2.00,6.00,4.00,9.00,6.00,5.00,5.00,8.00
 ])
 AT_CLEANUP
 
@@ -206,67 +190,15 @@ AT_CHECK([pspp -O format=csv frequencies.sps], [0], [dnl
 "frequencies.sps:17: warning: FREQUENCIES: When SPLIT FILE is in effect, the input data must be sorted by the split variables (for example, using SORT CASES), but multiple runs of cases with the same split values were found separated by cases with different values.  Each run will be analyzed separately.  The duplicate split values are: name = baz     "
 
 Table: Statistics
-name,,,value,quantity
-foo,N,Valid,1,1
-,,Missing,0,0
-,Mean,,1.00,5.00
-,Std Dev,,NaN,NaN
-,Minimum,,1.00,5.00
-,Maximum,,1.00,5.00
-bar,N,Valid,1,1
-,,Missing,0,0
-,Mean,,2.00,6.00
-,Std Dev,,NaN,NaN
-,Minimum,,2.00,6.00
-,Maximum,,2.00,6.00
-baz,N,Valid,1,1
-,,Missing,0,0
-,Mean,,1.00,9.00
-,Std Dev,,NaN,NaN
-,Minimum,,1.00,9.00
-,Maximum,,1.00,9.00
-quux,N,Valid,1,1
-,,Missing,0,0
-,Mean,,3.00,1.00
-,Std Dev,,NaN,NaN
-,Minimum,,3.00,1.00
-,Maximum,,3.00,1.00
-baz,N,Valid,1,1
-,,Missing,0,0
-,Mean,,4.00,3.00
-,Std Dev,,NaN,NaN
-,Minimum,,4.00,3.00
-,Maximum,,4.00,3.00
-bar,N,Valid,1,1
-,,Missing,0,0
-,Mean,,1.00,2.00
-,Std Dev,,NaN,NaN
-,Minimum,,1.00,2.00
-,Maximum,,1.00,2.00
-baz,N,Valid,1,1
-,,Missing,0,0
-,Mean,,1.00,1.00
-,Std Dev,,NaN,NaN
-,Minimum,,1.00,1.00
-,Maximum,,1.00,1.00
-foo,N,Valid,1,1
-,,Missing,0,0
-,Mean,,6.00,.00
-,Std Dev,,NaN,NaN
-,Minimum,,6.00,.00
-,Maximum,,6.00,.00
-baz,N,Valid,1,1
-,,Missing,0,0
-,Mean,,1.00,4.00
-,Std Dev,,NaN,NaN
-,Minimum,,1.00,4.00
-,Maximum,,1.00,4.00
-quux,N,Valid,1,1
-,,Missing,0,0
-,Mean,,5.00,8.00
-,Std Dev,,NaN,NaN
-,Minimum,,5.00,8.00
-,Maximum,,5.00,8.00
+,,name,,,,,,,,,,,,,,,,,,,
+,,foo,,bar,,baz,,quux,,baz,,bar,,baz,,foo,,baz,,quux,
+,,value,quantity,value,quantity,value,quantity,value,quantity,value,quantity,value,quantity,value,quantity,value,quantity,value,quantity,value,quantity
+N,Valid,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,Missing,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+Mean,,1.00,5.00,2.00,6.00,1.00,9.00,3.00,1.00,4.00,3.00,1.00,2.00,1.00,1.00,6.00,.00,1.00,4.00,5.00,8.00
+Std Dev,,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN,NaN
+Minimum,,1.00,5.00,2.00,6.00,1.00,9.00,3.00,1.00,4.00,3.00,1.00,2.00,1.00,1.00,6.00,.00,1.00,4.00,5.00,8.00
+Maximum,,1.00,5.00,2.00,6.00,1.00,9.00,3.00,1.00,4.00,3.00,1.00,2.00,1.00,1.00,6.00,.00,1.00,4.00,5.00,8.00
 
 frequencies.sps:17: warning: FREQUENCIES: Suppressed 1 additional warning about duplicate split values.
 ])