Mercurial > octave-nkf
changeset 13752:6f068e3f3f9c
Change f_cdf references to fcdf in statistics/test directory (Bug #34628)
* anova.m, f_test_regression.m, hotelling_test.m, hotelling_test_2.m,
manova.m, var_test.m: Change f_cdf reference to fcdf.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Tue, 25 Oct 2011 16:39:22 -0700 |
| parents | be7ff59cbc7a |
| children | ab4238b0b09b |
| files | scripts/statistics/tests/anova.m scripts/statistics/tests/f_test_regression.m scripts/statistics/tests/hotelling_test.m scripts/statistics/tests/hotelling_test_2.m scripts/statistics/tests/manova.m scripts/statistics/tests/var_test.m |
| diffstat | 6 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/statistics/tests/anova.m Tue Oct 25 22:35:55 2011 +0100 +++ b/scripts/statistics/tests/anova.m Tue Oct 25 16:39:22 2011 -0700 @@ -88,7 +88,7 @@ v_b = SSB / df_b; v_w = SSW / df_w; f = v_b / v_w; - pval = 1 - f_cdf (f, df_b, df_w); + pval = 1 - fcdf (f, df_b, df_w); if (nargout == 0) ## This eventually needs to be done more cleanly ...
--- a/scripts/statistics/tests/f_test_regression.m Tue Oct 25 22:35:55 2011 +0100 +++ b/scripts/statistics/tests/f_test_regression.m Tue Oct 25 16:39:22 2011 -0700 @@ -68,7 +68,7 @@ [b, v] = ols (y, x); diff = rr * b - r; f = diff' * inv (rr * inv (x' * x) * rr') * diff / (q * v); - pval = 1 - f_cdf (f, df_num, df_den); + pval = 1 - fcdf (f, df_num, df_den); if (nargout == 0) printf (" pval: %g\n", pval);
--- a/scripts/statistics/tests/hotelling_test.m Tue Oct 25 22:35:55 2011 +0100 +++ b/scripts/statistics/tests/hotelling_test.m Tue Oct 25 16:39:22 2011 -0700 @@ -63,7 +63,7 @@ d = mean (x) - m; Tsq = n * d * (cov (x) \ d'); - pval = 1 - f_cdf ((n-p) * Tsq / (p * (n-1)), p, n-p); + pval = 1 - fcdf ((n-p) * Tsq / (p * (n-1)), p, n-p); if (nargout == 0) printf (" pval: %g\n", pval);
--- a/scripts/statistics/tests/hotelling_test_2.m Tue Oct 25 22:35:55 2011 +0100 +++ b/scripts/statistics/tests/hotelling_test_2.m Tue Oct 25 16:39:22 2011 -0700 @@ -76,7 +76,7 @@ d = mean (x) - mean (y); S = ((n_x - 1) * cov (x) + (n_y - 1) * cov (y)) / (n_x + n_y - 2); Tsq = (n_x * n_y / (n_x + n_y)) * d * (S \ d'); - pval = 1 - f_cdf ((n_x + n_y - p - 1) * Tsq / (p * (n_x + n_y - 2)), + pval = 1 - fcdf ((n_x + n_y - p - 1) * Tsq / (p * (n_x + n_y - 2)), p, n_x + n_y - p - 1); if (nargout == 0)
--- a/scripts/statistics/tests/manova.m Tue Oct 25 22:35:55 2011 +0100 +++ b/scripts/statistics/tests/manova.m Tue Oct 25 16:39:22 2011 -0700 @@ -34,7 +34,7 @@ ## Three test statistics (Wilks, Hotelling-Lawley, and Pillai-Bartlett) ## and corresponding approximate p-values are calculated and displayed. -## (Currently NOT because the f_cdf respectively betai code is too bad.) +## (Currently NOT because the fcdf respectively betai code is too bad.) ## Author: TF <Thomas.Fuereder@ci.tuwien.ac.at> ## Adapted-By: KH <Kurt.Hornik@wu-wien.ac.at> @@ -107,7 +107,7 @@ df_den = delta * eta - df_num / 2 + 1; WT = exp (- log (Lambda) / eta) - 1; - W_pval_2 = 1 - f_cdf (WT * df_den / df_num, df_num, df_den); + W_pval_2 = 1 - fcdf (WT * df_den / df_num, df_num, df_den); if (0) @@ -123,7 +123,7 @@ df_num = theta * (2 * u + theta + 1); df_den = 2 * (theta * v + 1); - HL_pval = 1 - f_cdf (HL * df_den / df_num, df_num, df_den); + HL_pval = 1 - fcdf (HL * df_den / df_num, df_num, df_den); ## Pillai-Bartlett ## =============== @@ -131,7 +131,7 @@ PB = sum (l ./ (1 + l)); df_den = theta * (2 * v + theta + 1); - PB_pval = 1 - f_cdf (PB * df_den / df_num, df_num, df_den); + PB_pval = 1 - fcdf (PB * df_den / df_num, df_num, df_den); printf ("\n"); printf ("One-way MANOVA Table:\n");
--- a/scripts/statistics/tests/var_test.m Tue Oct 25 22:35:55 2011 +0100 +++ b/scripts/statistics/tests/var_test.m Tue Oct 25 16:39:22 2011 -0700 @@ -54,7 +54,7 @@ df_num = length (x) - 1; df_den = length (y) - 1; f = var (x) / var (y); - cdf = f_cdf (f, df_num, df_den); + cdf = fcdf (f, df_num, df_den); if (nargin == 2) alt = "!=";