From e7f87adee2e124bb3e0e3dc992d44fbe9b26e4c2 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 8 Feb 2004 14:59:41 +0000 Subject: [PATCH] Added calculations for the correlation for paired samples in t-test --- Smake | 12 ++- po/en_GB.po | 269 +++++++++++++++++++++++------------------------ po/pspp.pot | 107 ++++++++++++------- src/t-test.q | 288 +++++++++++++++++++++++++++++++++++++-------------- 4 files changed, 419 insertions(+), 257 deletions(-) diff --git a/Smake b/Smake index eae10349..00ae6ca7 100644 --- a/Smake +++ b/Smake @@ -15,7 +15,17 @@ install-sh Makefile.in: intl Makefile.am aclocal.m4 config.h.in ABOUT-NLS automake --add-missing po/Makefile.in.in intl ABOUT-NLS: - ./gettextize -f -c --no-changelog --intl + touch -f Makefile.am Makefile.am-stamp + touch -f configure.ac configure.ac-stamp + cp -a configure.ac configure.ac-bak + cp -a Makefile.am Makefile.am-bak + gettextize -f -c --no-changelog --intl + cp -a Makefile.am-bak Makefile.am + touch -f Makefile.am-stamp Makefile.am + cp -a configure.ac-bak configure.ac + touch -f configure.ac-stamp configure.ac + $(RM) configure.ac-bak configure.ac-stamp + $(RM) Makefile.am-bak Makefile.am-stamp diff --git a/po/en_GB.po b/po/en_GB.po index 833c24b0..4566f684 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.3.1\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2004-02-03 19:04+0800\n" +"POT-Creation-Date: 2004-02-07 14:00+0800\n" "PO-Revision-Date: 2004-01-23 13:04+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -16,281 +16,282 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: src/crosstabs.q:255 +#: src/crosstabs.q:254 msgid "" "Missing mode REPORT not allowed in general mode. Assuming MISSING=TABLE." msgstr "" -#: src/crosstabs.q:265 +#: src/crosstabs.q:264 msgid "Write mode ALL not allowed in general mode. Assuming WRITE=CELLS." msgstr "" -#: src/crosstabs.q:324 +#: src/crosstabs.q:323 msgid "expecting BY" msgstr "" -#: src/crosstabs.q:391 +#: src/crosstabs.q:390 msgid "VARIABLES must be specified before TABLES." msgstr "" -#: src/crosstabs.q:428 +#: src/crosstabs.q:427 #, c-format msgid "Maximum value (%ld) less than minimum value (%ld)." msgstr "" -#: src/crosstabs.q:865 +#: src/crosstabs.q:864 msgid "Summary." msgstr "" -#: src/crosstabs.q:867 +#: src/crosstabs.q:866 msgid "Cases" msgstr "" -#: src/crosstabs.q:868 src/frequencies.q:999 +#: src/crosstabs.q:867 src/frequencies.q:999 msgid "Valid" msgstr "" -#: src/crosstabs.q:869 src/frequencies.q:1066 +#: src/crosstabs.q:868 src/frequencies.q:1066 msgid "Missing" msgstr "" -#: src/crosstabs.q:870 src/crosstabs.q:1071 src/crosstabs.q:1800 +#: src/crosstabs.q:869 src/crosstabs.q:1070 src/crosstabs.q:1799 #: src/frequencies.q:1075 msgid "Total" msgstr "" -#: src/crosstabs.q:880 src/t-test.q:529 src/t-test.q:560 src/t-test.q:640 +#: src/crosstabs.q:879 src/t-test.q:517 src/t-test.q:540 src/t-test.q:605 +#: src/t-test.q:991 msgid "N" msgstr "" -#: src/crosstabs.q:881 src/frequencies.q:1003 src/frequencies.q:1004 +#: src/crosstabs.q:880 src/frequencies.q:1003 src/frequencies.q:1004 #: src/frequencies.q:1005 msgid "Percent" msgstr "" -#: src/crosstabs.q:1120 +#: src/crosstabs.q:1119 msgid "count" msgstr "" -#: src/crosstabs.q:1121 +#: src/crosstabs.q:1120 msgid "row %" msgstr "" -#: src/crosstabs.q:1122 +#: src/crosstabs.q:1121 msgid "column %" msgstr "" -#: src/crosstabs.q:1123 +#: src/crosstabs.q:1122 msgid "total %" msgstr "" -#: src/crosstabs.q:1124 +#: src/crosstabs.q:1123 msgid "expected" msgstr "" -#: src/crosstabs.q:1125 +#: src/crosstabs.q:1124 msgid "residual" msgstr "" -#: src/crosstabs.q:1126 +#: src/crosstabs.q:1125 msgid "std. resid." msgstr "" -#: src/crosstabs.q:1127 +#: src/crosstabs.q:1126 msgid "adj. resid." msgstr "" -#: src/crosstabs.q:1160 src/crosstabs.q:1187 src/crosstabs.q:1207 -#: src/crosstabs.q:1228 +#: src/crosstabs.q:1159 src/crosstabs.q:1186 src/crosstabs.q:1206 +#: src/crosstabs.q:1227 msgid "Statistic" msgstr "" -#: src/crosstabs.q:1161 src/crosstabs.q:1188 src/crosstabs.q:1208 -#: src/crosstabs.q:1230 src/frequencies.q:1001 src/frequencies.q:1118 +#: src/crosstabs.q:1160 src/crosstabs.q:1187 src/crosstabs.q:1207 +#: src/crosstabs.q:1229 src/frequencies.q:1001 src/frequencies.q:1118 #: src/sysfile-info.c:536 src/vfm.c:1094 msgid "Value" msgstr "" -#: src/crosstabs.q:1162 src/t-test.q:809 src/t-test.q:913 src/t-test.q:998 +#: src/crosstabs.q:1161 src/t-test.q:748 src/t-test.q:822 src/t-test.q:876 msgid "df" msgstr "" -#: src/crosstabs.q:1164 +#: src/crosstabs.q:1163 msgid "Asymp. Sig. (2-sided)" msgstr "" -#: src/crosstabs.q:1166 +#: src/crosstabs.q:1165 msgid "Exact. Sig. (2-sided)" msgstr "" -#: src/crosstabs.q:1168 +#: src/crosstabs.q:1167 msgid "Exact. Sig. (1-sided)" msgstr "" -#: src/crosstabs.q:1186 src/crosstabs.q:1227 +#: src/crosstabs.q:1185 src/crosstabs.q:1226 msgid "Category" msgstr "" -#: src/crosstabs.q:1189 src/crosstabs.q:1231 +#: src/crosstabs.q:1188 src/crosstabs.q:1230 msgid "Asymp. Std. Error" msgstr "" -#: src/crosstabs.q:1190 src/crosstabs.q:1232 +#: src/crosstabs.q:1189 src/crosstabs.q:1231 msgid "Approx. T" msgstr "" -#: src/crosstabs.q:1191 src/crosstabs.q:1233 +#: src/crosstabs.q:1190 src/crosstabs.q:1232 msgid "Approx. Sig." msgstr "" -#: src/crosstabs.q:1206 +#: src/crosstabs.q:1205 #, c-format msgid " 95%% Confidence Interval" msgstr "" -#: src/crosstabs.q:1209 src/t-test.q:813 src/t-test.q:910 src/t-test.q:1001 +#: src/crosstabs.q:1208 src/t-test.q:752 src/t-test.q:819 src/t-test.q:879 msgid "Lower" msgstr "" -#: src/crosstabs.q:1210 src/t-test.q:814 src/t-test.q:911 src/t-test.q:1002 +#: src/crosstabs.q:1209 src/t-test.q:753 src/t-test.q:820 src/t-test.q:880 msgid "Upper" msgstr "" -#: src/crosstabs.q:1229 +#: src/crosstabs.q:1228 msgid "Type" msgstr "" -#: src/crosstabs.q:1977 +#: src/crosstabs.q:1976 msgid "Pearson Chi-Square" msgstr "" -#: src/crosstabs.q:1978 +#: src/crosstabs.q:1977 msgid "Likelihood Ratio" msgstr "" -#: src/crosstabs.q:1979 +#: src/crosstabs.q:1978 msgid "Fisher's Exact Test" msgstr "" -#: src/crosstabs.q:1980 +#: src/crosstabs.q:1979 msgid "Continuity Correction" msgstr "" -#: src/crosstabs.q:1981 +#: src/crosstabs.q:1980 msgid "Linear-by-Linear Association" msgstr "" -#: src/crosstabs.q:2018 src/crosstabs.q:2088 src/crosstabs.q:2147 +#: src/crosstabs.q:2017 src/crosstabs.q:2087 src/crosstabs.q:2146 msgid "N of Valid Cases" msgstr "" -#: src/crosstabs.q:2034 src/crosstabs.q:2163 +#: src/crosstabs.q:2033 src/crosstabs.q:2162 msgid "Nominal by Nominal" msgstr "" -#: src/crosstabs.q:2035 src/crosstabs.q:2164 +#: src/crosstabs.q:2034 src/crosstabs.q:2163 msgid "Ordinal by Ordinal" msgstr "" -#: src/crosstabs.q:2036 +#: src/crosstabs.q:2035 msgid "Interval by Interval" msgstr "" -#: src/crosstabs.q:2037 +#: src/crosstabs.q:2036 msgid "Measure of Agreement" msgstr "" -#: src/crosstabs.q:2042 +#: src/crosstabs.q:2041 msgid "Phi" msgstr "" -#: src/crosstabs.q:2043 +#: src/crosstabs.q:2042 msgid "Cramer's V" msgstr "" -#: src/crosstabs.q:2044 +#: src/crosstabs.q:2043 msgid "Contingency Coefficient" msgstr "" -#: src/crosstabs.q:2045 +#: src/crosstabs.q:2044 msgid "Kendall's tau-b" msgstr "" -#: src/crosstabs.q:2046 +#: src/crosstabs.q:2045 msgid "Kendall's tau-c" msgstr "" -#: src/crosstabs.q:2047 +#: src/crosstabs.q:2046 msgid "Gamma" msgstr "" -#: src/crosstabs.q:2048 +#: src/crosstabs.q:2047 msgid "Spearman Correlation" msgstr "" -#: src/crosstabs.q:2049 +#: src/crosstabs.q:2048 msgid "Pearson's R" msgstr "" -#: src/crosstabs.q:2050 +#: src/crosstabs.q:2049 msgid "Kappa" msgstr "" -#: src/crosstabs.q:2120 +#: src/crosstabs.q:2119 #, c-format msgid "Odds Ratio for %s (%g / %g)" msgstr "" -#: src/crosstabs.q:2123 +#: src/crosstabs.q:2122 #, c-format msgid "Odds Ratio for %s (%.*s / %.*s)" msgstr "" -#: src/crosstabs.q:2131 +#: src/crosstabs.q:2130 #, c-format msgid "For cohort %s = %g" msgstr "" -#: src/crosstabs.q:2134 +#: src/crosstabs.q:2133 #, c-format msgid "For cohort %s = %.*s" msgstr "" -#: src/crosstabs.q:2165 +#: src/crosstabs.q:2164 msgid "Nominal by Interval" msgstr "" -#: src/crosstabs.q:2170 +#: src/crosstabs.q:2169 msgid "Lambda" msgstr "" -#: src/crosstabs.q:2171 +#: src/crosstabs.q:2170 msgid "Goodman and Kruskal tau" msgstr "" -#: src/crosstabs.q:2172 +#: src/crosstabs.q:2171 msgid "Uncertainty Coefficient" msgstr "" -#: src/crosstabs.q:2173 +#: src/crosstabs.q:2172 msgid "Somers' d" msgstr "" -#: src/crosstabs.q:2174 +#: src/crosstabs.q:2173 msgid "Eta" msgstr "" -#: src/crosstabs.q:2179 +#: src/crosstabs.q:2178 msgid "Symmetric" msgstr "" -#: src/crosstabs.q:2180 src/crosstabs.q:2181 +#: src/crosstabs.q:2179 src/crosstabs.q:2180 #, c-format msgid "%s Dependent" msgstr "" -#: src/descript.q:152 src/frequencies.q:94 src/t-test.q:530 src/t-test.q:561 -#: src/t-test.q:639 src/t-test.q:907 +#: src/descript.q:152 src/frequencies.q:94 src/t-test.q:518 src/t-test.q:541 +#: src/t-test.q:604 src/t-test.q:816 msgid "Mean" msgstr "" @@ -785,12 +786,10 @@ msgstr "" msgid "MXLOOPS must be at least 1." msgstr "" -#: src/set.q:314 -msgid "TBFONTS not implemented." -msgstr "" - -#: src/set.q:316 -msgid "TB1 not implemented." +#: src/set.q:314 src/set.q:316 src/set.q:846 src/cmdline.c:112 +#: src/cmdline.c:131 src/cmdline.c:143 src/command.c:196 +#, c-format +msgid "%s is not yet implemented." msgstr "" #: src/set.q:390 @@ -854,154 +853,167 @@ msgstr "Upper window colour must be between 0 and 6." msgid "Frame color must be between 0 and 6." msgstr "Frame colour must be between 0 and 6." -#: src/set.q:846 -msgid "VIEWLENGTH not implemented." -msgstr "" - #: src/set.q:865 msgid "Drive letter expected in WORKDEV subcommand." msgstr "" -#: src/t-test.q:158 +#: src/t-test.q:169 msgid "Exactly one of TESTVAL, GROUPS or PAIRS subcommands is required" msgstr "" -#: src/t-test.q:172 +#: src/t-test.q:183 msgid "VARIABLES subcommand is not appropriate with PAIRS" msgstr "" -#: src/t-test.q:207 src/t-test.q:276 +#: src/t-test.q:223 src/t-test.q:294 #, c-format msgid "`%s' is not a variable name" msgstr "" -#: src/t-test.q:220 +#: src/t-test.q:236 #, c-format msgid "Long string variable %s is not valid here." msgstr "" -#: src/t-test.q:237 +#: src/t-test.q:252 msgid "" "When applying GROUPS to a string variable, at least one value must be " "specified." msgstr "" -#: src/t-test.q:318 +#: src/t-test.q:329 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%d) did not " "match the number following (%d)." msgstr "" -#: src/t-test.q:337 +#: src/t-test.q:346 msgid "At least two variables must be specified on PAIRS." msgstr "" -#: src/t-test.q:525 +#: src/t-test.q:515 msgid "One-Sample Statistics" msgstr "" -#: src/t-test.q:531 src/t-test.q:562 src/t-test.q:641 src/t-test.q:908 +#: src/t-test.q:519 src/t-test.q:542 src/t-test.q:606 src/t-test.q:817 msgid "Std. Deviation" msgstr "" -#: src/t-test.q:532 src/t-test.q:563 src/t-test.q:642 +#: src/t-test.q:520 src/t-test.q:543 src/t-test.q:607 msgid "SE. Mean" msgstr "" -#: src/t-test.q:554 +#: src/t-test.q:537 msgid "Group Statistics" msgstr "" -#: src/t-test.q:634 +#: src/t-test.q:601 msgid "Paired Sample Statistics" msgstr "" -#: src/t-test.q:665 src/t-test.q:940 +#: src/t-test.q:625 src/t-test.q:839 src/t-test.q:1004 #, c-format msgid "Pair %d" msgstr "" -#: src/t-test.q:781 +#: src/t-test.q:733 msgid "Independent Samples Test" msgstr "" -#: src/t-test.q:800 +#: src/t-test.q:741 msgid "Levine's Test for Equality of Variances" msgstr "" -#: src/t-test.q:803 +#: src/t-test.q:743 msgid "t-test for Equality of Means" msgstr "" -#: src/t-test.q:806 +#: src/t-test.q:745 msgid "F" msgstr "" -#: src/t-test.q:807 +#: src/t-test.q:746 src/t-test.q:993 msgid "Sig." msgstr "" -#: src/t-test.q:808 src/t-test.q:912 src/t-test.q:997 +#: src/t-test.q:747 src/t-test.q:821 src/t-test.q:875 msgid "t" msgstr "" -#: src/t-test.q:810 src/t-test.q:914 src/t-test.q:999 +#: src/t-test.q:749 src/t-test.q:823 src/t-test.q:877 msgid "Sig. (2-tailed)" msgstr "" -#: src/t-test.q:811 src/t-test.q:1000 +#: src/t-test.q:750 src/t-test.q:878 msgid "Mean Difference" msgstr "" -#: src/t-test.q:812 +#: src/t-test.q:751 msgid "Std. Error Difference" msgstr "" -#: src/t-test.q:819 src/t-test.q:898 src/t-test.q:985 +#: src/t-test.q:757 src/t-test.q:809 src/t-test.q:869 #, c-format msgid "%d%% Confidence Interval of the Difference" msgstr "" -#: src/t-test.q:846 +#: src/t-test.q:777 msgid "Equal variances assumed" msgstr "" -#: src/t-test.q:849 +#: src/t-test.q:780 msgid "Equal variances not assumed" msgstr "" -#: src/t-test.q:872 +#: src/t-test.q:798 msgid "Paired Samples Test" msgstr "" -#: src/t-test.q:880 +#: src/t-test.q:801 msgid "Paired Differences" msgstr "" -#: src/t-test.q:909 +#: src/t-test.q:818 msgid "Std. Error Mean" msgstr "" -#: src/t-test.q:968 +#: src/t-test.q:860 msgid "One-Sample Test" msgstr "" -#: src/t-test.q:975 +#: src/t-test.q:864 #, c-format msgid "Test Value = %f" msgstr "" -#: src/aggregate.c:188 -msgid "OUTFILE specified multiple times." +#: src/t-test.q:920 src/t-test.q:936 +#, c-format +msgid "Error calculating T statistic (cdft returned %d)." msgstr "" -#: src/aggregate.c:214 -msgid "while expecting COLUMNWISE" +#: src/t-test.q:988 +msgid "Paired Samples Correlations" +msgstr "" + +#: src/t-test.q:992 +msgid "Correlation" +msgstr "" + +#: src/t-test.q:1008 +#, c-format +msgid "%s & %s" +msgstr "" + +#: src/aggregate.c:188 src/aggregate.c:229 src/data-list.c:1321 +#: src/data-list.c:1356 src/data-list.c:1369 src/data-list.c:1382 +#: src/data-list.c:1415 +#, c-format +msgid "%s subcommand given multiple times." msgstr "" -#: src/aggregate.c:229 -msgid "BREAK specified multiple times." +#: src/aggregate.c:214 +msgid "while expecting COLUMNWISE" msgstr "" #: src/aggregate.c:258 @@ -1208,11 +1220,6 @@ msgstr "" msgid "Duplicate variable name %s among target variables." msgstr "" -#: src/cmdline.c:112 src/cmdline.c:131 src/cmdline.c:143 src/command.c:196 -#, c-format -msgid "%s is not yet implemented." -msgstr "" - #: src/cmdline.c:157 msgid "" "\n" @@ -1746,36 +1753,16 @@ msgid "" "TYPE." msgstr "" -#: src/data-list.c:1321 -msgid "STARTS subcommand given multiple times." -msgstr "" - #: src/data-list.c:1345 #, c-format msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)." msgstr "" -#: src/data-list.c:1356 -msgid "OCCURS subcommand given multiple times." -msgstr "" - -#: src/data-list.c:1369 -msgid "LENGTH subcommand given multiple times." -msgstr "" - -#: src/data-list.c:1382 -msgid "CONTINUED subcommand given multiple times." -msgstr "" - #: src/data-list.c:1401 #, c-format msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)." msgstr "" -#: src/data-list.c:1415 -msgid "ID subcommand given multiple times." -msgstr "" - #: src/data-list.c:1424 #, c-format msgid "ID beginning column (%ld) must be positive." diff --git a/po/pspp.pot b/po/pspp.pot index 07117ae5..6f7f7a9f 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2004-02-05 14:00+0800\n" +"POT-Creation-Date: 2004-02-07 14:00+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -60,7 +60,8 @@ msgstr "" msgid "Total" msgstr "" -#: src/crosstabs.q:879 src/t-test.q:510 src/t-test.q:533 src/t-test.q:598 +#: src/crosstabs.q:879 src/t-test.q:517 src/t-test.q:540 src/t-test.q:605 +#: src/t-test.q:991 msgid "N" msgstr "" @@ -112,7 +113,7 @@ msgstr "" msgid "Value" msgstr "" -#: src/crosstabs.q:1161 src/t-test.q:741 src/t-test.q:815 src/t-test.q:869 +#: src/crosstabs.q:1161 src/t-test.q:748 src/t-test.q:822 src/t-test.q:876 msgid "df" msgstr "" @@ -149,11 +150,11 @@ msgstr "" msgid " 95%% Confidence Interval" msgstr "" -#: src/crosstabs.q:1208 src/t-test.q:745 src/t-test.q:812 src/t-test.q:872 +#: src/crosstabs.q:1208 src/t-test.q:752 src/t-test.q:819 src/t-test.q:879 msgid "Lower" msgstr "" -#: src/crosstabs.q:1209 src/t-test.q:746 src/t-test.q:813 src/t-test.q:873 +#: src/crosstabs.q:1209 src/t-test.q:753 src/t-test.q:820 src/t-test.q:880 msgid "Upper" msgstr "" @@ -290,8 +291,8 @@ msgstr "" msgid "%s Dependent" msgstr "" -#: src/descript.q:152 src/frequencies.q:94 src/t-test.q:511 src/t-test.q:534 -#: src/t-test.q:597 src/t-test.q:809 +#: src/descript.q:152 src/frequencies.q:94 src/t-test.q:518 src/t-test.q:541 +#: src/t-test.q:604 src/t-test.q:816 msgid "Mean" msgstr "" @@ -857,141 +858,154 @@ msgstr "" msgid "Drive letter expected in WORKDEV subcommand." msgstr "" -#: src/t-test.q:166 +#: src/t-test.q:169 msgid "Exactly one of TESTVAL, GROUPS or PAIRS subcommands is required" msgstr "" -#: src/t-test.q:180 +#: src/t-test.q:183 msgid "VARIABLES subcommand is not appropriate with PAIRS" msgstr "" -#: src/t-test.q:216 src/t-test.q:287 +#: src/t-test.q:223 src/t-test.q:294 #, c-format msgid "`%s' is not a variable name" msgstr "" -#: src/t-test.q:229 +#: src/t-test.q:236 #, c-format msgid "Long string variable %s is not valid here." msgstr "" -#: src/t-test.q:245 +#: src/t-test.q:252 msgid "" "When applying GROUPS to a string variable, at least one value must be " "specified." msgstr "" -#: src/t-test.q:322 +#: src/t-test.q:329 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%d) did not " "match the number following (%d)." msgstr "" -#: src/t-test.q:339 +#: src/t-test.q:346 msgid "At least two variables must be specified on PAIRS." msgstr "" -#: src/t-test.q:508 +#: src/t-test.q:515 msgid "One-Sample Statistics" msgstr "" -#: src/t-test.q:512 src/t-test.q:535 src/t-test.q:599 src/t-test.q:810 +#: src/t-test.q:519 src/t-test.q:542 src/t-test.q:606 src/t-test.q:817 msgid "Std. Deviation" msgstr "" -#: src/t-test.q:513 src/t-test.q:536 src/t-test.q:600 +#: src/t-test.q:520 src/t-test.q:543 src/t-test.q:607 msgid "SE. Mean" msgstr "" -#: src/t-test.q:530 +#: src/t-test.q:537 msgid "Group Statistics" msgstr "" -#: src/t-test.q:594 +#: src/t-test.q:601 msgid "Paired Sample Statistics" msgstr "" -#: src/t-test.q:618 src/t-test.q:832 +#: src/t-test.q:625 src/t-test.q:839 src/t-test.q:1004 #, c-format msgid "Pair %d" msgstr "" -#: src/t-test.q:726 +#: src/t-test.q:733 msgid "Independent Samples Test" msgstr "" -#: src/t-test.q:734 +#: src/t-test.q:741 msgid "Levine's Test for Equality of Variances" msgstr "" -#: src/t-test.q:736 +#: src/t-test.q:743 msgid "t-test for Equality of Means" msgstr "" -#: src/t-test.q:738 +#: src/t-test.q:745 msgid "F" msgstr "" -#: src/t-test.q:739 +#: src/t-test.q:746 src/t-test.q:993 msgid "Sig." msgstr "" -#: src/t-test.q:740 src/t-test.q:814 src/t-test.q:868 +#: src/t-test.q:747 src/t-test.q:821 src/t-test.q:875 msgid "t" msgstr "" -#: src/t-test.q:742 src/t-test.q:816 src/t-test.q:870 +#: src/t-test.q:749 src/t-test.q:823 src/t-test.q:877 msgid "Sig. (2-tailed)" msgstr "" -#: src/t-test.q:743 src/t-test.q:871 +#: src/t-test.q:750 src/t-test.q:878 msgid "Mean Difference" msgstr "" -#: src/t-test.q:744 +#: src/t-test.q:751 msgid "Std. Error Difference" msgstr "" -#: src/t-test.q:750 src/t-test.q:802 src/t-test.q:862 +#: src/t-test.q:757 src/t-test.q:809 src/t-test.q:869 #, c-format msgid "%d%% Confidence Interval of the Difference" msgstr "" -#: src/t-test.q:770 +#: src/t-test.q:777 msgid "Equal variances assumed" msgstr "" -#: src/t-test.q:773 +#: src/t-test.q:780 msgid "Equal variances not assumed" msgstr "" -#: src/t-test.q:791 +#: src/t-test.q:798 msgid "Paired Samples Test" msgstr "" -#: src/t-test.q:794 +#: src/t-test.q:801 msgid "Paired Differences" msgstr "" -#: src/t-test.q:811 +#: src/t-test.q:818 msgid "Std. Error Mean" msgstr "" -#: src/t-test.q:853 +#: src/t-test.q:860 msgid "One-Sample Test" msgstr "" -#: src/t-test.q:857 +#: src/t-test.q:864 #, c-format msgid "Test Value = %f" msgstr "" -#: src/t-test.q:913 src/t-test.q:929 +#: src/t-test.q:920 src/t-test.q:936 #, c-format msgid "Error calculating T statistic (cdft returned %d)." msgstr "" +#: src/t-test.q:988 +msgid "Paired Samples Correlations" +msgstr "" + +#: src/t-test.q:992 +msgid "Correlation" +msgstr "" + +#: src/t-test.q:1008 +#, c-format +msgid "%s & %s" +msgstr "" + #: src/aggregate.c:188 src/aggregate.c:229 src/data-list.c:1321 #: src/data-list.c:1356 src/data-list.c:1369 src/data-list.c:1382 #: src/data-list.c:1415 @@ -2306,10 +2320,12 @@ msgid "Boolean" msgstr "" #: src/expr-prs.c:1695 +#, c-format msgid "!!TERMINAL!!" msgstr "" #: src/expr-prs.c:1721 +#, c-format msgid "!!SENTINEL!!" msgstr "" @@ -2627,14 +2643,17 @@ msgid "`)' expected after output format." msgstr "" #: src/formats.c:153 +#, c-format msgid "Formats:\n" msgstr "" #: src/formats.c:154 +#, c-format msgid " Name Print Write\n" msgstr "" #: src/get.c:110 +#, c-format msgid "GET translation table from file to memory:\n" msgstr "" @@ -2672,6 +2691,7 @@ msgid "Requested renaming duplicates variable name %s." msgstr "" #: src/get.c:461 +#, c-format msgid "" "\n" "Variables in dictionary:\n" @@ -2731,6 +2751,7 @@ msgid "expecting COMM or TAPE" msgstr "" #: src/get.c:1393 +#, c-format msgid "IMPORT translation table from file to memory:\n" msgstr "" @@ -2924,6 +2945,7 @@ msgid "<>" msgstr "" #: src/hash.c:492 +#, c-format msgid "hash table:" msgstr "" @@ -2933,6 +2955,7 @@ msgid "bad ordering of keys %d and %d\n" msgstr "" #: src/heap.c:177 +#, c-format msgid "Heap contents:\n" msgstr "" @@ -3073,6 +3096,7 @@ msgid "The rest of this command has been discarded." msgstr "" #: src/lexer.c:842 src/print.c:1174 +#, c-format msgid "" msgstr "" @@ -3390,6 +3414,7 @@ msgid "(long string variable)" msgstr "" #: src/mis-val.c:376 +#, c-format msgid "(no missing values)\n" msgstr "" @@ -3534,6 +3559,7 @@ msgid "Error reading device definition file." msgstr "" #: src/output.c:462 +#, c-format msgid "" "Driver classes:\n" "\t" @@ -4130,10 +4156,12 @@ msgid "" msgstr "" #: src/recode.c:869 +#, c-format msgid "!!END!!" msgstr "" #: src/recode.c:890 src/recode.c:906 +#, c-format msgid "!!ERROR!!" msgstr "" @@ -4967,6 +4995,7 @@ msgid "Value labels:" msgstr "" #: src/val-labs.c:237 +#, c-format msgid " (no value labels)\n" msgstr "" @@ -4979,10 +5008,12 @@ msgid "Truncating variable label to 120 characters." msgstr "" #: src/var-labs.c:87 +#, c-format msgid "Variable labels:\n" msgstr "" #: src/var-labs.c:94 +#, c-format msgid "(no variable label)" msgstr "" diff --git a/src/t-test.q b/src/t-test.q index c2fc85d7..e7555033 100644 --- a/src/t-test.q +++ b/src/t-test.q @@ -37,6 +37,8 @@ #include "var.h" #include "vfm.h" #include "pool.h" +#include "hash.h" +#include "stats.h" /* (specification) "T-TEST" (tts_): @@ -68,8 +70,12 @@ static union value groups_values[2]; /* PAIRS: Number of pairs to be compared ; each pair. */ static int n_pairs ; -typedef struct variable *pair_t[2] ; -static pair_t *pairs; +struct pair +{ + struct variable *v[2]; + double correlation; +}; +static struct pair *pairs; static int parse_value (union value * v, int type) ; @@ -142,6 +148,13 @@ static int one_sample_calc (struct ccase *); static void one_sample_precalc (void); static void one_sample_postcalc (void); +static int paired_calc (struct ccase *); +static void paired_precalc (void); +static void paired_postcalc (void); + +static int compare_var_name (const void *a_, const void *b_, void *v_ unused); +static unsigned hash_var_name (const void *a_, void *v_ unused); + int cmd_t_test(void) @@ -178,16 +191,59 @@ cmd_t_test(void) else mode=T_PAIRED; - if ( mode == T_PAIRED && cmd.sbc_variables) + if ( mode == T_PAIRED) { - msg(SE, _("VARIABLES subcommand is not appropriate with PAIRS")); - return CMD_FAILURE; + if (cmd.sbc_variables) + { + msg(SE, _("VARIABLES subcommand is not appropriate with PAIRS")); + return CMD_FAILURE; + } + else + { + /* Iterate through the pairs and put each variable that is a + member of a pair into cmd.v_variables */ + + int i; + struct hsh_iterator hi; + struct hsh_table *hash; + struct variable *v; + + hash=hsh_create(n_pairs,compare_var_name,hash_var_name,0,0); + + for (i=0; i < n_pairs; ++i) + { + hsh_insert(hash,pairs[i].v[0]); + hsh_insert(hash,pairs[i].v[1]); + } + + assert(cmd.n_variables == 0); + cmd.n_variables = hsh_count(hash); + + cmd.v_variables = xrealloc(cmd.v_variables, + sizeof(struct variable) * cmd.n_variables); + /* Iterate through the hash */ + for (i=0,v = (struct variable *) hsh_first(hash,&hi); + v != 0; + v=hsh_next(hash,&hi) ) + cmd.v_variables[i++]=v; + + hsh_destroy(hash); + } } + procedure(common_precalc,common_calc,common_postcalc); - if (mode == T_1_SAMPLE) - procedure(one_sample_precalc,one_sample_calc,one_sample_postcalc); + switch(mode) + { + case T_1_SAMPLE: + procedure(one_sample_precalc,one_sample_calc,one_sample_postcalc); + break; + case T_PAIRED: + procedure(paired_precalc,paired_calc,paired_postcalc); + break; + } + t_test_pool = pool_create (); @@ -353,7 +409,7 @@ tts_custom_pairs (struct cmd_t_test *cmd unused) } /* Allocate storage for the pairs */ - pairs = xrealloc(pairs,sizeof(pair_t) *n_pairs); + pairs = xrealloc(pairs,sizeof(struct pair) *n_pairs); /* Populate the pairs with the appropriate variables */ if ( paired ) @@ -363,8 +419,8 @@ tts_custom_pairs (struct cmd_t_test *cmd unused) assert(n_pairs == n_vars/2); for (i = 0; i < n_pairs ; ++i) { - pairs[i][0] = vars[i]; - pairs[i][1] = vars[i+n_pairs]; + pairs[i].v[0] = vars[i]; + pairs[i].v[1] = vars[i+n_pairs]; } } else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */ @@ -376,8 +432,8 @@ tts_custom_pairs (struct cmd_t_test *cmd unused) { for(j=0 ; j < n_after_WITH ; ++j) { - pairs[p][0] = vars[i]; - pairs[p][1] = vars[j+n_before_WITH]; + pairs[p].v[0] = vars[i]; + pairs[p].v[1] = vars[j+n_before_WITH]; ++p; } } @@ -391,8 +447,8 @@ tts_custom_pairs (struct cmd_t_test *cmd unused) { for(j=i+1 ; j < n_vars ; ++j) { - pairs[p][0] = vars[i]; - pairs[p][1] = vars[j]; + pairs[p].v[0] = vars[i]; + pairs[p].v[1] = vars[j]; ++p; } } @@ -613,23 +669,35 @@ void ssbox_paired_populate(struct ssbox *ssb,struct cmd_t_test *cmd unused) { int i; - struct string ds; assert(ssb->t); - ds_init(t_test_pool,&ds,15); for (i=0; i < n_pairs; ++i) { - ds_clear(&ds); + int j; + + tab_text (ssb->t, 0, i*2+1, TAB_LEFT | TAT_PRINTF , _("Pair %d"),i); + + for (j=0 ; j < 2 ; ++j) + { + struct t_test_proc *ttp; + + ttp=&pairs[i].v[j]->p.t_t; + + /* Titles */ - ds_printf(&ds,_("Pair %d"),i); + tab_text (ssb->t, 1, i*2+j+1, TAB_LEFT, pairs[i].v[j]->name); + + /* Values */ + tab_float (ssb->t,2, i*2+j+1, TAB_RIGHT, ttp->mean, 8, 2); + tab_float (ssb->t,3, i*2+j+1, TAB_RIGHT, ttp->n, 2, 0); + tab_float (ssb->t,4, i*2+j+1, TAB_RIGHT, ttp->std_dev, 8, 3); + tab_float (ssb->t,5, i*2+j+1, TAB_RIGHT, ttp->se_mean, 8, 3); + + } - tab_text (ssb->t, 0, i*2+1, TAB_LEFT, ds.string); - tab_text (ssb->t, 1, i*2+1, TAB_LEFT, pairs[i][0]->name); - tab_text (ssb->t, 1, i*2+2, TAB_LEFT, pairs[i][1]->name); } - ds_destroy(&ds); } /* Populate the one sample ssbox */ @@ -724,8 +792,6 @@ trbox_independent_samples_init(struct trbox *self, const int hsize=11; const int vsize=cmd->n_variables*2+3; - struct string ds; - assert(self); self->populate = trbox_independent_samples_populate; @@ -752,14 +818,10 @@ trbox_independent_samples_init(struct trbox *self, tab_text(self->t,9,2, TAB_CENTER | TAT_TITLE,_("Lower")); tab_text(self->t,10,2, TAB_CENTER | TAT_TITLE,_("Upper")); - ds_init(t_test_pool,&ds,80); - - ds_printf(&ds,_("%d%% Confidence Interval of the Difference"), - (int)round(cmd->criteria*100.0)); + tab_joint_text(self->t, 9, 1, 10, 1, TAB_CENTER | TAT_PRINTF, + _("%d%% Confidence Interval of the Difference"), + (int)round(cmd->criteria*100.0)); - tab_joint_text(self->t,9,1,10,1,TAB_CENTER, ds.string); - - ds_destroy(&ds); } /* Populate the independent samples trbox */ @@ -790,8 +852,6 @@ trbox_paired_init(struct trbox *self, const int hsize=10; const int vsize=n_pairs*2+3; - struct string ds; - self->populate = trbox_paired_populate; trbox_base_init(self,n_pairs*2,hsize); @@ -804,14 +864,9 @@ trbox_paired_init(struct trbox *self, tab_hline(self->t,TAL_1,5,6, 2); tab_vline(self->t,TAL_0,6,0,1); - ds_init(t_test_pool,&ds,80); - - ds_printf(&ds,_("%d%% Confidence Interval of the Difference"), - (int)round(cmd->criteria*100.0)); - - tab_joint_text(self->t,5,1,6,1,TAB_CENTER, ds.string); - - ds_destroy(&ds); + tab_joint_text(self->t, 5, 1, 6, 1, TAB_CENTER | TAT_PRINTF, + _("%d%% Confidence Interval of the Difference"), + (int)round(cmd->criteria*100.0)); tab_text (self->t, 2, 2, TAB_CENTER | TAT_TITLE, _("Mean")); tab_text (self->t, 3, 2, TAB_CENTER | TAT_TITLE, _("Std. Deviation")); @@ -829,20 +884,14 @@ trbox_paired_populate(struct trbox *trb, struct cmd_t_test *cmd unused) { int i; - struct string ds; - - ds_init(t_test_pool,&ds,15); for (i=0; i < n_pairs; ++i) { - ds_clear(&ds); - ds_printf(&ds,_("Pair %d"),i); - - tab_text (trb->t, 0, i*2+3, TAB_LEFT, ds.string); - tab_text (trb->t, 1, i*2+3, TAB_LEFT, pairs[i][0]->name); - tab_text (trb->t, 1, i*2+4, TAB_LEFT, pairs[i][1]->name); + tab_text (trb->t, 0, i*2+3, TAB_LEFT | TAT_PRINTF, _("Pair %d"),i); + tab_text (trb->t, 1, i*2+3, TAB_LEFT, pairs[i].v[0]->name); + tab_text (trb->t, 1, i*2+4, TAB_LEFT, pairs[i].v[1]->name); } - ds_destroy(&ds); + } /* Initialize the one sample trbox */ @@ -852,24 +901,23 @@ trbox_one_sample_init(struct trbox *self, struct cmd_t_test *cmd ) const int hsize=7; const int vsize=cmd->n_variables+3; - struct string ds; - self->populate = trbox_one_sample_populate; trbox_base_init(self, cmd->n_variables,hsize); tab_title (self->t, 0, _("One-Sample Test")); tab_hline(self->t, TAL_1, 1, hsize - 1, 1); tab_vline(self->t, TAL_2, 1, 0, vsize); - ds_init(t_test_pool, &ds, 80); - ds_printf(&ds,_("Test Value = %f"),cmd->n_testval); - tab_joint_text(self->t, 1, 0, hsize-1,0, TAB_CENTER,ds.string); + + tab_joint_text(self->t, 1, 0, hsize-1,0, TAB_CENTER | TAT_PRINTF, + _("Test Value = %f"),cmd->n_testval); + tab_box(self->t, -1, -1, -1, TAL_1, 1,1,hsize-1,vsize-1); - ds_clear(&ds); - ds_printf(&ds,_("%d%% Confidence Interval of the Difference"), - (int)round(cmd->criteria*100.0)); - tab_joint_text(self->t,5,1,6,1,TAB_CENTER, ds.string); - ds_destroy(&ds); + + tab_joint_text(self->t,5,1,6,1,TAB_CENTER | TAT_PRINTF, + _("%d%% Confidence Interval of the Difference"), + (int)round(cmd->criteria*100.0)); + tab_vline(self->t,TAL_0,6,1,1); tab_hline(self->t,TAL_1,5,6,2); tab_text (self->t, 1, 2, TAB_CENTER | TAT_TITLE, _("t")); @@ -992,26 +1040,48 @@ pscbox(struct cmd_t_test *cmd) tab_text(table, 3,0, TAB_CENTER | TAT_TITLE, _("Correlation")); tab_text(table, 4,0, TAB_CENTER | TAT_TITLE, _("Sig.")); - /* row headings */ - { - struct string ds; - - ds_init(t_test_pool,&ds,15); for (i=0; i < n_pairs; ++i) { - ds_clear(&ds); - ds_printf(&ds,_("Pair %d"),i); - tab_text(table, 0,i+1, TAB_LEFT | TAT_TITLE, ds.string); + int which =1; + double p,q; - ds_clear(&ds); - ds_printf(&ds,_("%s & %s"),pairs[i][0]->name,pairs[i][1]->name); - tab_text(table, 1,i+1, TAB_LEFT | TAT_TITLE, ds.string); - } + int status; + double bound; + + const double df = pairs[i].v[0]->p.t_t.n -2; + + double correlation_t = + pairs[i].correlation * sqrt(df) / + sqrt(1 - sqr(pairs[i].correlation)); + + + /* row headings */ + tab_text(table, 0,i+1, TAB_LEFT | TAT_TITLE | TAT_PRINTF, + _("Pair %d"), i); + + tab_text(table, 1,i+1, TAB_LEFT | TAT_TITLE | TAT_PRINTF, + _("%s & %s"), pairs[i].v[0]->name, pairs[i].v[1]->name); - ds_destroy(&ds); - } + /* row data */ + tab_float(table, 3, i+1, TAB_RIGHT, pairs[i].correlation, 8, 3); + tab_float(table, 2, i+1, TAB_RIGHT, pairs[i].v[0]->p.t_t.n , 4, 0); + + + cdft(&which, &p, &q, &correlation_t, &df, &status, &bound); + + if ( 0 != status ) + { + msg( SE, _("Error calculating T statistic (cdft returned %d)."),status); + } + + + tab_float(table, 4, i+1, TAB_RIGHT, q*2.0, 8, 3); + + + + } tab_submit(table); } @@ -1051,7 +1121,7 @@ static void common_precalc (void) { int i=0; - + for(i=0; i< cmd.n_variables ; ++i) { struct t_test_proc *ttp; @@ -1082,7 +1152,6 @@ common_postcalc (void) ) ; ttp->se_mean = ttp->std_dev / sqrt(ttp->n); - ttp->mean_diff= ttp->sum_diff / ttp->n; } } @@ -1140,3 +1209,68 @@ one_sample_postcalc (void) ttp->mean_diff = ttp->sum_diff / ttp->n ; } } + + + +static int +compare_var_name (const void *a_, const void *b_, void *v_ unused) +{ + const struct variable *a = a_; + const struct variable *b = b_; + + return strcmp(a->name,b->name); +} + +static unsigned +hash_var_name (const void *a_, void *v_ unused) +{ + const struct variable *a = a_; + + return hsh_hash_bytes (a->name, strlen(a->name)); +} + + +static void +paired_precalc (void) +{ + int i; + for(i=0; i < n_pairs ; ++i ) + pairs[i].correlation=0; +} + +static int +paired_calc (struct ccase *c) +{ + int i; + + for(i=0; i < n_pairs ; ++i ) + { + struct variable *v0 = pairs[i].v[0]; + struct variable *v1 = pairs[i].v[1]; + + union value *val0 = &c->data[v0->fv]; + union value *val1 = &c->data[v1->fv]; + + pairs[i].correlation += ( val0->f - pairs[i].v[0]->p.t_t.mean ) + * + ( val1->f - pairs[i].v[1]->p.t_t.mean ); + } + + + return 0; +} + +static void +paired_postcalc (void) +{ + int i; + + for(i=0; i < n_pairs ; ++i ) + { + + pairs[i].correlation /= pairs[i].v[0]->p.t_t.std_dev * + pairs[i].v[1]->p.t_t.std_dev ; + + pairs[i].correlation /= pairs[i].v[0]->p.t_t.n -1; + } +} -- 2.30.2