Annotate some more results as p-values and update the tests accordingly

diff --git a/src/language/stats/regression.c b/src/language/stats/regression.c
index ef5a9f28d1eafc0c99cc3df6ae5ae04ba68125c0..cbffb7d45ecf909a473edf5caa1844dfa2368b81 100644 (file)
--- a/src/language/stats/regression.c
+++ b/src/language/stats/regression.c
@@ -960,7 +960,7 @@ reg_stats_anova (const linreg * c, const struct variable *var)
 
   tab_double (t, 5, 1, 0, F, NULL, RC_OTHER);
 
-  tab_double (t, 6, 1, 0, pval, NULL, RC_OTHER);
+  tab_double (t, 6, 1, 0, pval, NULL, RC_PVALUE);
 
   tab_title (t, _("ANOVA (%s)"), var_to_string (var));
   tab_submit (t);

diff --git a/src/language/stats/t-test-indep.c b/src/language/stats/t-test-indep.c
index f17a1d5b785fdb739092dd11f79ea57e6855c913..d90a98e94ffcf7d9663c2b434518e780f9682ecf 100644 (file)
--- a/src/language/stats/t-test-indep.c
+++ b/src/language/stats/t-test-indep.c
@@ -386,7 +386,7 @@ indep_test (const struct tt *tt, const struct pair_stats *ps)
       double df1 = 1;
       double df2 = cc0 + cc1 - 2;
       double q = gsl_cdf_fdist_Q (ps[v].lev, df1, df2);
-      tab_double (t, 3, v * 2 + heading_rows, TAB_CENTER, q, NULL, RC_OTHER);
+      tab_double (t, 3, v * 2 + heading_rows, TAB_CENTER, q, NULL, RC_PVALUE);
     }
   }
 

diff --git a/src/language/stats/t-test-paired.c b/src/language/stats/t-test-paired.c
index 55a31a252148fb06cd424df2935beff1eaf3c608..933b0b35535dcdcc07517302dc9d0160e04337b0 100644 (file)
--- a/src/language/stats/t-test-paired.c
+++ b/src/language/stats/t-test-paired.c
@@ -261,7 +261,7 @@ paired_correlations (const struct tt *tt, struct paired_samp *os)
 
       tab_double (t, 3, v + heading_rows, TAB_RIGHT, corr, NULL, RC_OTHER);
       tab_double (t, 4, v + heading_rows, TAB_RIGHT, 
-                 2.0 * significance_of_correlation (corr, cc0), NULL, RC_OTHER);
+                 2.0 * significance_of_correlation (corr, cc0), NULL, RC_PVALUE);
     }
 
   tab_submit (t);

diff --git a/tests/language/stats/regression.at b/tests/language/stats/regression.at
index 46b2b09eac0d2aaf76ea5479e5864b0763a69ffd..d194d73bfb99e69b2f7a811d89b064f227e4a3fe 100644 (file)
--- a/tests/language/stats/regression.at
+++ b/tests/language/stats/regression.at
@@ -1700,7 +1700,7 @@ Table: Model Summary (v0)
 
 Table: ANOVA (v0)
 ,,Sum of Squares,df,Mean Square,F,Sig.
-,Regression,235.23,1,235.23,3.58,.06
+,Regression,235.23,1,235.23,3.58,.059
 ,Residual,98438.40,1498,65.71,,
 ,Total,98673.63,1499,,,
 

diff --git a/tests/language/stats/t-test.at b/tests/language/stats/t-test.at
index 24b00f23093c9a65ce109a210430f7079767ecae..14251c1b01c688209ad31c0ae2c8beaf8a1b0adc 100644 (file)
--- a/tests/language/stats/t-test.at
+++ b/tests/language/stats/t-test.at
@@ -28,7 +28,7 @@ Pair 1,A,2.00,5,.71,.32
 
 Table: Paired Samples Correlations
 ,,N,Correlation,Sig.
-Pair 1,A & B,5,.92,.03
+Pair 1,A & B,5,.92,.028
 
 Table: Paired Samples Test
 ,,Paired Differences,,,,,,,
@@ -73,8 +73,8 @@ Pair 2,c,5.10,5,.69,.31
 
 Table: Paired Samples Correlations
 ,,N,Correlation,Sig.
-Pair 1,a & b,5,.92,.03
-Pair 2,c & d,5,-.92,.03
+Pair 1,a & b,5,.92,.028
+Pair 2,c & d,5,-.92,.028
 
 Table: Paired Samples Test
 ,,Paired Differences,,,,,,,
@@ -118,6 +118,7 @@ end data.
 
 t-test /PAIRS a b with c d (PAIRED). 
 ])
+
 AT_DATA([expout], [dnl
 Table: Reading free-form data from INLINE.
 Variable,Format
@@ -136,8 +137,8 @@ Pair 2,b,4.00,5,1.54,.69
 
 Table: Paired Samples Correlations
 ,,N,Correlation,Sig.
-Pair 1,a & c,5,.41,.49
-Pair 2,b & d,5,-.87,.05
+Pair 1,a & c,5,.41,.493
+Pair 2,b & d,5,-.87,.054
 
 Table: Paired Samples Test
 ,,Paired Differences,,,,,,,
@@ -249,9 +250,9 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-DEP1,Equal variances assumed,.00,1.00,-4.47,8.00,.002,-2.00,.45,-3.03,-.97
+DEP1,Equal variances assumed,.00,1.000,-4.47,8.00,.002,-2.00,.45,-3.03,-.97
 ,Equal variances not assumed,,,-4.47,8.00,.002,-2.00,.45,-3.03,-.97
-DEP2,Equal variances assumed,.00,1.00,4.47,8.00,.002,2.00,.45,.97,3.03
+DEP2,Equal variances assumed,.00,1.000,4.47,8.00,.002,2.00,.45,.97,3.03
 ,Equal variances not assumed,,,4.47,8.00,.002,2.00,.45,.97,3.03
 ])
 
@@ -286,6 +287,7 @@ begin data.
 end data.
 t-test /groups=indep(1.514) /var=dep.
 ])
+
 AT_CHECK([pspp -O format=csv t-test.sps], [0], [dnl
 Table: Reading free-form data from INLINE.
 Variable,Format
@@ -301,7 +303,7 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-DEP,Equal variances assumed,.17,.68,.69,20.00,.495,1.00,1.44,-2.00,4.00
+DEP,Equal variances assumed,.17,.683,.69,20.00,.495,1.00,1.44,-2.00,4.00
 ,Equal variances not assumed,,,.69,18.54,.496,1.00,1.44,-2.02,4.02
 ])
 AT_CLEANUP
@@ -338,9 +340,9 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-dep1,Equal variances assumed,3.75,.15,-1.12,3.00,.346,-.75,.67,-2.89,1.39
+dep1,Equal variances assumed,3.75,.148,-1.12,3.00,.346,-.75,.67,-2.89,1.39
 ,Equal variances not assumed,,,-1.34,2.78,.279,-.75,.56,-2.61,1.11
-dep2,Equal variances assumed,.60,.50,2.85,3.00,.065,3.00,1.05,-.35,6.35
+dep2,Equal variances assumed,.60,.495,2.85,3.00,.065,3.00,1.05,-.35,6.35
 ,Equal variances not assumed,,,2.60,1.68,.144,3.00,1.15,-2.98,8.98
 ])
 AT_CHECK([pspp -o ref.csv ref.sps])
@@ -400,9 +402,9 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-dep1,Equal variances assumed,2.00,.23,-1.73,4.00,.158,-1.00,.58,-2.60,.60
+dep1,Equal variances assumed,2.00,.230,-1.73,4.00,.158,-1.00,.58,-2.60,.60
 ,Equal variances not assumed,,,-1.73,3.20,.176,-1.00,.58,-2.77,.77
-dep2,Equal variances assumed,.00,1.00,3.67,4.00,.021,3.00,.82,.73,5.27
+dep2,Equal variances assumed,.00,1.000,3.67,4.00,.021,3.00,.82,.73,5.27
 ,Equal variances not assumed,,,3.67,4.00,.021,3.00,.82,.73,5.27
 ])
 
@@ -593,7 +595,7 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-x,Equal variances assumed,2.00,.23,-1.73,4.00,.158,-1.00,.58,-2.60,.60
+x,Equal variances assumed,2.00,.230,-1.73,4.00,.158,-1.00,.58,-2.60,.60
 ,Equal variances not assumed,,,-1.73,3.20,.176,-1.00,.58,-2.77,.77
 ])
 AT_CHECK([pspp -o ref.csv ref.sps])
@@ -683,9 +685,9 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-DEP1,Equal variances assumed,.00,1.00,-4.47,8.00,.002,-2.00,.45,-3.03,-.97
+DEP1,Equal variances assumed,.00,1.000,-4.47,8.00,.002,-2.00,.45,-3.03,-.97
 ,Equal variances not assumed,,,-4.47,8.00,.002,-2.00,.45,-3.03,-.97
-DEP2,Equal variances assumed,.00,1.00,4.47,8.00,.002,2.00,.45,.97,3.03
+DEP2,Equal variances assumed,.00,1.000,4.47,8.00,.002,2.00,.45,.97,3.03
 ,Equal variances not assumed,,,4.47,8.00,.002,2.00,.45,.97,3.03
 ])
 AT_CLEANUP
@@ -733,6 +735,7 @@ end data.
 t-test group=gv('One', 'Two')
        /variables = x.
 ])
+
 AT_CHECK([pspp -O format=csv t-test.sps], [0], [dnl
 Table: Reading free-form data from INLINE.
 Variable,Format
@@ -748,7 +751,7 @@ Table: Independent Samples Test
 ,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
 ,,,,,,,,,95% Confidence Interval of the Difference,
 ,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
-x,Equal variances assumed,1.13,.33,-2.32,6.00,.060,-.90,.39,-1.85,.05
+x,Equal variances assumed,1.13,.329,-2.32,6.00,.060,-.90,.39,-1.85,.05
 ,Equal variances not assumed,,,-2.38,4.70,.067,-.90,.38,-1.89,.09
 ])
 AT_CLEANUP