X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fstats%2Ffrequencies.at;h=5ab31a5d9f4b1fee361448e52ddb64e38f71eb41;hb=8d546197ce011c2f296560b3f560859ffe8c1ae8;hp=6c85236b49b803f9ae303a26a1c0c96c247f9878;hpb=1e9875fc6bd073f970e28de5ef49e82717705858;p=pspp

diff --git a/tests/language/stats/frequencies.at b/tests/language/stats/frequencies.at
index 6c85236b49..5ab31a5d9f 100644
--- 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.
 ])