X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fstats%2Foneway.at;h=a0a3bafb745abeff97c97e06f8213a0bb328543c;hb=4b8c6191f0204d6a0b62650490ef2794d62ec79c;hp=3c77b41eac8d8dff4744c7b6815c09f285e64380;hpb=2fc70481c7621ee4d51f986c53c4add4ec6cc57d;p=pspp-builds.git

diff --git a/tests/language/stats/oneway.at b/tests/language/stats/oneway.at
index 3c77b41e..a0a3bafb 100644
--- a/tests/language/stats/oneway.at
+++ b/tests/language/stats/oneway.at
@@ -4,19 +4,19 @@ AT_SETUP([ONEWAY basic operation])
 AT_DATA([oneway.sps],
   [DATA LIST NOTABLE LIST /QUALITY * BRAND * .
 BEGIN DATA
-3 1
-2 1
-1 1
-1 1
-4 1
-5 2
-2 2
-4 2
-2 2
-3 2
 7  3
 4  3
+3  1
+2  1
+1  1
+4  2
+2  2
+3  2
 5  3
+1  1
+4  1
+5  2
+2  2
 3  3
 6  3
 END DATA
@@ -414,9 +414,9 @@ ONEWAY x y z by g
 	/CONTRAST 2 -9 7  0
 	.
 ])
-
-
-AT_CHECK([pspp -O format=csv multivar.sps], [0], 
+AT_CHECK([pspp -o pspp.csv multivar.sps])
+dnl Some machines return 3.88 instead of 3.87 below (see bug #31611).
+AT_CHECK([sed 's/^,Within Groups,3.88/,Within Groups,3.87/' pspp.csv], [0],
 [Table: Descriptives
 ,,,,,,95% Confidence Interval for Mean,,,
 ,,N,Mean,Std. Deviation,Std. Error,Lower Bound,Upper Bound,Minimum,Maximum
@@ -448,7 +448,7 @@ x,Between Groups,56.16,3,18.72,2.92,.06
 ,Within Groups,128.34,20,6.42,,
 ,Total,184.50,23,,,
 y,Between Groups,7.75,3,2.58,13.33,.00
-,Within Groups,3.88,20,.19,,
+,Within Groups,3.87,20,.19,,
 ,Total,11.63,23,,,
 z,Between Groups,17.47,3,5.82,.62,.61
 ,Within Groups,187.87,20,9.39,,
@@ -477,3 +477,77 @@ z,Assume equal variances,1,-9.70,8.07,1.20,20,.24
 ])
 
 AT_CLEANUP
+
+
+
+dnl Tests that everything treats weights properly
+AT_SETUP([ONEWAY vs. weights])
+
+AT_DATA([oneway-unweighted.sps],
+[DATA LIST NOTABLE LIST /QUALITY * BRAND * W *.
+BEGIN DATA
+3  1   1
+2  1   1
+1  1   1
+1  1   1
+4  1   1
+5  2   1
+2  2   1
+4  2   1
+4  2   1
+4  2   1
+2  2   1
+2  2   1
+3  2   1
+7  3   1
+4  3   1
+5  3   1
+5  3   1
+3  3   1
+6  3   1
+END DATA.
+
+WEIGHT BY W.
+
+ONEWAY
+	quality BY brand
+	/STATISTICS descriptives homogeneity
+	.
+])
+
+AT_CHECK([pspp -o pspp-unweighted.csv oneway-unweighted.sps], [0], [ignore], [ignore])
+
+AT_DATA([oneway-weighted.sps],
+[DATA LIST NOTABLE LIST /QUALITY * BRAND * W *.
+BEGIN DATA
+3  1   1
+2  1   1
+1  1   2
+4  1   1
+5  2   1
+2  2   1
+4  2   3
+2  2   2
+3  2   1
+7  3   1
+4  3   1
+5  3   2
+3  3   1
+6  3   1
+END DATA.
+
+WEIGHT BY W.
+
+ONEWAY
+	quality BY brand
+	/STATISTICS descriptives homogeneity
+	.
+])
+
+AT_CHECK([pspp -o pspp-weighted.csv oneway-weighted.sps], [0], [ignore], [ignore])
+
+
+AT_CHECK([diff pspp-weighted.csv pspp-unweighted.csv], [0])
+
+
+AT_CLEANUP