From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 23 Jul 2009 06:15:20 +0000 (+0200)
Subject: Merge commit 'origin/stable'
X-Git-Tag: build37~48
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp-builds.git

Merge commit 'origin/stable'

Conflicts:

	src/language/stats/t-test.q
---

b5c82cc9aabe7e641011130240ae1b2e84348e23
diff --cc src/language/stats/t-test.q
index 09a96cfc,c69a6cdb..d02cdb28
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@@ -958,26 -1259,30 +958,26 @@@ trbox_paired_populate (struct trbox *tr
  
        t = gsl_cdf_tdist_Qinv (q, df);
  
 -      tab_double (trb->t, 5, i+3, TAB_RIGHT,
 -		pairs[i].mean_diff - t * se_mean , NULL);
 +      tab_double (trb->t, 5, i + 3, TAB_RIGHT,
 +                 pair->mean_diff - t * se_mean, NULL);
 +      tab_double (trb->t, 6, i + 3, TAB_RIGHT,
 +                 pair->mean_diff + t * se_mean, NULL);
  
 -      tab_double (trb->t, 6, i+3, TAB_RIGHT,
 -		pairs[i].mean_diff + t * se_mean , NULL);
 +      t = ((pair->mean[0] - pair->mean[1])
 +           / sqrt ((pow2 (pair->s_std_dev[0]) + pow2 (pair->s_std_dev[1])
 +                    - (2 * pair->correlation
 +                       * pair->s_std_dev[0] * pair->s_std_dev[1]))
 +                   / (n - 1)));
  
 -      t = (pairs[i].mean[0] - pairs[i].mean[1])
 -	/ sqrt (
 -		( pow2 (pairs[i].s_std_dev[0]) + pow2 (pairs[i].s_std_dev[1]) -
 -		  2 * pairs[i].correlation *
 -		  pairs[i].s_std_dev[0] * pairs[i].s_std_dev[1] )
 -		/ (n - 1)
 -		);
 -
 -      tab_double (trb->t, 7, i+3, TAB_RIGHT, t, NULL);
 +      tab_double (trb->t, 7, i + 3, TAB_RIGHT, t, NULL);
  
        /* Degrees of freedom */
 -      tab_double (trb->t, 8, i+3, TAB_RIGHT, df, wfmt);
 +      tab_double (trb->t, 8, i + 3, TAB_RIGHT, df, &proc->weight_format);
  
-       p = gsl_cdf_tdist_P (t, df);
-       q = gsl_cdf_tdist_P (t, df);
+       p = gsl_cdf_tdist_P (t,df);
+       q = gsl_cdf_tdist_Q (t,df);
  
 -      tab_double (trb->t, 9, i+3, TAB_RIGHT, 2.0* (t>0?q:p), NULL);
 -
 +      tab_double (trb->t, 9, i + 3, TAB_RIGHT, 2.0 * (t > 0 ? q : p), NULL);
      }
  }