X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fstats%2Fcrosstabs.at;h=eab403e3c91a396a6ad25836e44f0c7143c9118e;hb=8e6f8bf3152f9ed166769b32f542b98991db4a4f;hp=40117dc7e91f3d9d88236aaeac1162dac6b53398;hpb=4f8462c882f28fed5345be2dab9d2cc73cd0b2da;p=pspp

diff --git a/tests/language/stats/crosstabs.at b/tests/language/stats/crosstabs.at
index 40117dc7e9..eab403e3c9 100644
--- a/tests/language/stats/crosstabs.at
+++ b/tests/language/stats/crosstabs.at
@@ -44,13 +44,13 @@ Table: X × Y
 ,,,Y,,,,,,,Total
 ,,,1.00,2.00,3.00,4.00,5.00,6.00,7.00,
 X,1.00,Count,0,0,0,0,0,0,0,0
-,2.00,,0,0,0,0,0,0,0,0
-,3.00,,0,0,0,0,0,0,0,0
-,4.00,,0,0,0,0,1,0,0,1
-,5.00,,0,0,0,0,0,0,0,0
-,6.00,,0,0,0,0,0,0,0,0
-,7.00,,0,0,0,0,0,0,0,0
-Total,,,0,0,0,0,1,0,0,1
+,2.00,Count,0,0,0,0,0,0,0,0
+,3.00,Count,0,0,0,0,0,0,0,0
+,4.00,Count,0,0,0,0,1,0,0,1
+,5.00,Count,0,0,0,0,0,0,0,0
+,6.00,Count,0,0,0,0,0,0,0,0
+,7.00,Count,0,0,0,0,0,0,0,0
+Total,,Count,0,0,0,0,1,0,0,1
 ]])
 AT_CLEANUP
 
@@ -79,8 +79,12 @@ Table: Summary
 x × y,0,.0%,1,100.0%,1,100.0%
 
 Table: x × y
-,,
-,,
+,,,y,,,,,,,Total
+,,,1.00,2.00,3.00,4.00,5.00,6.00,7.00,
+x,1.00,Count,,,,,,,,
+,2.00,Count,,,,,,,,
+,3.00,Count,,,,,,,,
+Total,,Count,,,,,,,,
 ]])
 AT_CLEANUP
 
@@ -120,9 +124,9 @@ Table: x × y
 ,,,y,,,,Total
 ,,,one unity,three lots,two duality,zero none,
 x,1.00,Count,1,0,0,1,2
-,2.00,,0,0,1,0,1
-,3.00,,0,1,0,0,1
-Total,,,1,1,1,1,4
+,2.00,Count,0,0,1,0,1
+,3.00,Count,0,1,0,0,1
+Total,,Count,1,1,1,1,4
 ]])
 AT_CLEANUP
 
@@ -179,8 +183,8 @@ Table: y × z
 ,,,z,,Total
 ,,,1,2,
 y,1,Count,4,3,7
-,2,,1,1,2
-Total,,,5,4,9
+,2,Count,1,1,2
+Total,,Count,5,4,9
 ])
 AT_CLEANUP
 
@@ -216,9 +220,9 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,2.00,Count,0,1,1
-,3.00,,1,0,1
-,4.00,,1,1,2
-Total,,,2,2,4
+,3.00,Count,1,0,1
+,4.00,Count,1,1,2
+Total,,Count,2,2,4
 
 Table: Chi-Square Tests
 ,Value,df,Asymptotic Sig. (2-tailed)
@@ -250,7 +254,7 @@ SPLIT FILE SEPARATE BY v0.
 
 CROSSTABS
     /TABLES= v1 BY v2
-    /FORMAT=AVALUE TABLES PIVOT
+    /FORMAT=AVALUE TABLES
     /STATISTICS=CHISQ
     /CELLS=COUNT ROW COLUMN TOTAL.
 ])
@@ -381,16 +385,16 @@ Table: x × y × z
 ,,,,,y,,Total
 ,,,,,1,2,
 z,1,x,1,Count,1,0,1
-,,,3,,0,0,1
-,,,5,,1,0,1
-,,,7,,0,0,1
-,,,8,,0,1,1
-,,Total,,,4,1,5
-,2,x,2,,0,0,1
-,,,4,,0,1,1
-,,,6,,0,0,1
-,,,9,,1,0,1
-,,Total,,,3,1,4
+,,,3,Count,0,0,1
+,,,5,Count,1,0,1
+,,,7,Count,0,0,1
+,,,8,Count,0,1,1
+,,Total,,Count,4,1,5
+,2,x,2,Count,0,0,1
+,,,4,Count,0,1,1
+,,,6,Count,0,0,1
+,,,9,Count,1,0,1
+,,Total,,Count,3,1,4
 
 Table: Chi-Square Tests
 ,,,Value,df,Asymptotic Sig. (2-tailed)
@@ -493,8 +497,8 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,1.00,Count,2.80,3.20,6.00
-,2.00,,1.00,2.00,3.00
-Total,,,3.80,5.20,9.00
+,2.00,Count,1.00,2.00,3.00
+Total,,Count,3.80,5.20,9.00
 
 Table: Summary
 ,Cases,,,,,
@@ -506,8 +510,8 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,1.00,Count,2.80,3.20,6.00
-,2.00,,1.00,2.00,3.00
-Total,,,3.80,5.20,9.00
+,2.00,Count,1.00,2.00,3.00
+Total,,Count,3.80,5.20,9.00
 
 Table: Summary
 ,Cases,,,,,
@@ -519,8 +523,8 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,1.00,Count,2.00,4.00,6.00
-,2.00,,1.00,2.00,3.00
-Total,,,3.00,6.00,9.00
+,2.00,Count,1.00,2.00,3.00
+Total,,Count,3.00,6.00,9.00
 
 Table: Summary
 ,Cases,,,,,
@@ -532,8 +536,8 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,1.00,Count,2.00,2.00,4.00
-,2.00,,1.00,2.00,3.00
-Total,,,3.00,4.00,7.00
+,2.00,Count,1.00,2.00,3.00
+Total,,Count,3.00,4.00,7.00
 
 Table: Summary
 ,Cases,,,,,
@@ -545,8 +549,8 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,1.00,Count,3.00,3.00,6.00
-,2.00,,1.00,2.00,3.00
-Total,,,4.00,5.00,9.00
+,2.00,Count,1.00,2.00,3.00
+Total,,Count,4.00,5.00,9.00
 
 Table: Summary
 ,Cases,,,,,
@@ -558,8 +562,8 @@ Table: x × y
 ,,,y,,Total
 ,,,1.00,2.00,
 x,1.00,Count,2.00,3.00,5.00
-,2.00,,1.00,2.00,3.00
-Total,,,3.00,5.00,8.00
+,2.00,Count,1.00,2.00,3.00
+Total,,Count,3.00,5.00,8.00
 ])
 AT_CLEANUP
 
@@ -592,9 +596,9 @@ Table: x × y
 ,,,y,,Total
 ,,,2.00,1.00,
 x,4.00,Count,0,1,1
-,3.00,,2,1,3
-,2.00,,2,0,2
-Total,,,4,2,6
+,3.00,Count,2,1,3
+,2.00,Count,2,0,2
+Total,,Count,4,2,6
 ])
 AT_CLEANUP
 
@@ -854,8 +858,8 @@ Table: type of school × female
 ,,,female,,Total
 ,,,male,female,
 type of school,public,Count,77,91,168
-,private,,14,18,32
-Total,,,91,109,200
+,private,Count,14,18,32
+Total,,Count,91,109,200
 
 Table: Chi-Square Tests
 ,Value,df,Asymptotic Sig. (2-tailed),Exact Sig. (2-tailed),Exact Sig. (1-tailed)
@@ -876,8 +880,8 @@ Table: female × ses
 ,,,ses,,,Total
 ,,,low,middle,high,
 female,male,Count,15,47,29,91
-,female,,32,48,29,109
-Total,,,47,95,58,200
+,female,Count,32,48,29,109
+Total,,Count,47,95,58,200
 
 Table: Chi-Square Tests
 ,Value,df,Asymptotic Sig. (2-tailed)
@@ -916,10 +920,10 @@ Table: x × y
 ,,,y,,,,,Total
 ,,,4.000,6.000,10.000,12.000,13.000,
 x,1.000,Count,1,0,0,0,0,1
-,3.000,,0,1,0,0,0,1
-,5.000,,0,0,1,1,0,2
-,6.000,,0,0,0,0,1,1
-Total,,,1,1,1,1,1,5
+,3.000,Count,0,1,0,0,0,1
+,5.000,Count,0,0,1,1,0,2
+,6.000,Count,0,0,0,0,1,1
+Total,,Count,1,1,1,1,1,5
 
 Table: Symmetric Measures
 ,,Value,Asymp. Std. Error,Approx. T
@@ -961,16 +965,16 @@ Table: x × y
 ,,,y,,,,,,,,,Total
 ,,,1.500,4.000,5.000,6.000,6.500,7.000,9.000,10.500,11.000,
 x,1.000,Count,1,0,0,0,0,0,0,0,0,1
-,2.000,,1,0,0,0,0,0,0,0,0,1
-,3.000,,0,1,0,0,0,0,0,0,0,1
-,4.000,,0,0,0,1,0,0,0,0,0,1
-,5.000,,0,0,1,0,0,0,0,0,0,1
-,6.000,,0,0,0,0,0,1,0,0,0,1
-,7.000,,0,0,0,0,1,0,0,0,0,1
-,8.000,,0,0,0,0,0,0,1,0,0,1
-,9.000,,0,0,0,0,0,0,0,1,0,1
-,10.000,,0,0,0,0,0,0,0,0,1,1
-Total,,,2,1,1,1,1,1,1,1,1,10
+,2.000,Count,1,0,0,0,0,0,0,0,0,1
+,3.000,Count,0,1,0,0,0,0,0,0,0,1
+,4.000,Count,0,0,0,1,0,0,0,0,0,1
+,5.000,Count,0,0,1,0,0,0,0,0,0,1
+,6.000,Count,0,0,0,0,0,1,0,0,0,1
+,7.000,Count,0,0,0,0,1,0,0,0,0,1
+,8.000,Count,0,0,0,0,0,0,1,0,0,1
+,9.000,Count,0,0,0,0,0,0,0,1,0,1
+,10.000,Count,0,0,0,0,0,0,0,0,1,1
+Total,,Count,2,1,1,1,1,1,1,1,1,10
 
 Table: Symmetric Measures
 ,,Value,Asymp. Std. Error,Approx. T
@@ -1011,13 +1015,13 @@ Table: x × y
 ,,,y,,,,,,,,Total
 ,,,28.000,58.000,66.000,75.000,85.000,87.000,91.000,122.000,
 x,25.000,Count,1,0,0,0,0,0,0,0,1
-,35.000,,0,1,0,0,0,0,0,0,1
-,44.000,,0,0,1,0,0,0,0,0,1
-,50.000,,0,0,0,1,0,0,0,0,1
-,56.000,,0,0,0,0,0,1,1,0,2
-,65.000,,0,0,0,0,1,0,1,0,2
-,87.000,,0,0,0,0,0,0,0,1,1
-Total,,,1,1,1,1,1,1,2,1,9
+,35.000,Count,0,1,0,0,0,0,0,0,1
+,44.000,Count,0,0,1,0,0,0,0,0,1
+,50.000,Count,0,0,0,1,0,0,0,0,1
+,56.000,Count,0,0,0,0,0,1,1,0,2
+,65.000,Count,0,0,0,0,1,0,1,0,2
+,87.000,Count,0,0,0,0,0,0,0,1,1
+Total,,Count,1,1,1,1,1,1,2,1,9
 
 Table: Symmetric Measures
 ,,Value,Asymp. Std. Error,Approx. T
@@ -1061,15 +1065,15 @@ Table: x × y
 ,,,y,,,,,,,,,,,,Total
 ,,,2.000,4.000,5.000,7.000,9.000,11.000,12.000,14.000,15.000,17.000,18.000,20.000,
 x,2.000,Count,0,0,0,1,0,0,0,0,0,0,0,0,1
-,3.000,,0,0,0,0,0,0,1,0,0,0,0,0,1
-,4.000,,0,0,0,0,1,1,0,0,0,0,0,0,2
-,5.000,,0,0,1,0,0,0,0,0,0,0,0,0,1
-,6.000,,1,1,0,0,0,0,0,0,0,0,0,0,2
-,7.000,,0,0,0,0,0,0,0,1,0,0,0,0,1
-,8.000,,0,0,0,0,0,0,0,0,1,0,0,0,1
-,9.000,,0,0,0,0,0,0,0,0,0,1,0,0,1
-,10.000,,0,0,0,0,0,0,0,0,0,0,1,1,2
-Total,,,1,1,1,1,1,1,1,1,1,1,1,1,12
+,3.000,Count,0,0,0,0,0,0,1,0,0,0,0,0,1
+,4.000,Count,0,0,0,0,1,1,0,0,0,0,0,0,2
+,5.000,Count,0,0,1,0,0,0,0,0,0,0,0,0,1
+,6.000,Count,1,1,0,0,0,0,0,0,0,0,0,0,2
+,7.000,Count,0,0,0,0,0,0,0,1,0,0,0,0,1
+,8.000,Count,0,0,0,0,0,0,0,0,1,0,0,0,1
+,9.000,Count,0,0,0,0,0,0,0,0,0,1,0,0,1
+,10.000,Count,0,0,0,0,0,0,0,0,0,0,1,1,2
+Total,,Count,1,1,1,1,1,1,1,1,1,1,1,1,12
 
 Table: Symmetric Measures
 ,,Value,Asymp. Std. Error,Approx. T
@@ -1111,16 +1115,16 @@ Table: x × y
 ,,,y,,,,,,,,,,Total
 ,,,15000.00,26000.00,29000.00,32000.00,33000.00,41000.00,45000.00,52000.00,68000.00,80000.00,
 x,18.000,Count,1,0,0,0,0,0,0,0,0,0,1
-,24.000,,0,1,0,0,0,0,0,0,0,0,1
-,25.000,,0,0,1,0,0,0,0,0,0,0,1
-,26.000,,0,0,0,1,0,0,0,0,0,0,1
-,33.000,,0,0,0,0,1,0,0,0,0,0,1
-,37.000,,0,0,0,0,0,1,0,0,0,0,1
-,40.000,,0,0,0,0,0,0,1,0,0,0,1
-,45.000,,0,0,0,0,0,0,0,1,0,0,1
-,57.000,,0,0,0,0,0,0,0,0,1,0,1
-,64.000,,0,0,0,0,0,0,0,0,0,1,1
-Total,,,1,1,1,1,1,1,1,1,1,1,10
+,24.000,Count,0,1,0,0,0,0,0,0,0,0,1
+,25.000,Count,0,0,1,0,0,0,0,0,0,0,1
+,26.000,Count,0,0,0,1,0,0,0,0,0,0,1
+,33.000,Count,0,0,0,0,1,0,0,0,0,0,1
+,37.000,Count,0,0,0,0,0,1,0,0,0,0,1
+,40.000,Count,0,0,0,0,0,0,1,0,0,0,1
+,45.000,Count,0,0,0,0,0,0,0,1,0,0,1
+,57.000,Count,0,0,0,0,0,0,0,0,1,0,1
+,64.000,Count,0,0,0,0,0,0,0,0,0,1,1
+Total,,Count,1,1,1,1,1,1,1,1,1,1,10
 
 Table: Symmetric Measures
 ,,Value,Asymp. Std. Error,Approx. T
@@ -1655,7 +1659,7 @@ end data.
 weight by w.
 
 crosstabs /table = p1 by p2
-	statistics = kappa
+	/statistics = kappa
 	.
 ])
 
@@ -1671,8 +1675,8 @@ Table: p1 × p2
 ,,,p2,,Total
 ,,,.000,1.000,
 p1,.000,Count,18.000,1.000,19.000
-,1.000,,1.000,.000,1.000
-Total,,,19.000,1.000,20.000
+,1.000,Count,1.000,.000,1.000
+Total,,Count,19.000,1.000,20.000
 
 Table: Symmetric Measures
 ,,Value,Asymp. Std. Error,Approx. T
@@ -1814,8 +1818,8 @@ Table: factor × disease
 ,,,disease,,Total
 ,,,Yes,No,
 factor,Placebo,Count,20,80,100
-,Aspirin,,15,135,150
-Total,,,35,215,250
+,Aspirin,Count,15,135,150
+Total,,Count,35,215,250
 
 Table: Chi-Square Tests
 ,Value,df,Asymptotic Sig. (2-tailed),Exact Sig. (2-tailed),Exact Sig. (1-tailed)