[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/pspp.pot src/data/ChangeLog sr...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/pspp.pot src/data/ChangeLog sr... |
|
Date: |
Mon, 16 Apr 2007 10:49:32 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/04/16 10:49:32
Modified files:
po : de.po pspp.pot
src/data : ChangeLog sys-file-reader.c
src/language/stats: ChangeLog t-test.q
Log message:
Increase width of N and DEF cells in T-TEST.
Assume that string variables with 0 measure data ought to be NOMINAL.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/t-test.q?cvsroot=pspp&r1=1.21&r2=1.22
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- po/de.po 16 Apr 2007 03:06:50 -0000 1.45
+++ po/de.po 16 Apr 2007 10:49:31 -0000 1.46
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-04-15 17:51-0700\n"
+"POT-Creation-Date: 2007-04-16 18:39+0800\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -320,21 +320,21 @@
msgid "Numeric"
msgstr "Nummer"
-#: src/data/format.c:311 src/data/sys-file-reader.c:1026
-#: src/data/sys-file-reader.c:1028
+#: src/data/format.c:311 src/data/sys-file-reader.c:1029
+#: src/data/sys-file-reader.c:1031
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
-#: src/language/xforms/recode.c:467 src/language/xforms/recode.c:468
-#: src/language/xforms/recode.c:480 src/language/xforms/recode.c:481
+#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
+#: src/language/xforms/recode.c:481 src/language/xforms/recode.c:482
msgid "numeric"
msgstr "numerisch"
-#: src/data/format.c:311 src/data/sys-file-reader.c:1026
-#: src/data/sys-file-reader.c:1028
+#: src/data/format.c:311 src/data/sys-file-reader.c:1029
+#: src/data/sys-file-reader.c:1031
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
-#: src/language/xforms/recode.c:467 src/language/xforms/recode.c:468
-#: src/language/xforms/recode.c:480 src/language/xforms/recode.c:481
+#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
+#: src/language/xforms/recode.c:481 src/language/xforms/recode.c:482
msgid "string"
msgstr "kette"
@@ -683,104 +683,104 @@
msgid "Bad size (%u) or count (%u) on extension 11."
msgstr ""
-#: src/data/sys-file-reader.c:819
+#: src/data/sys-file-reader.c:823
msgid "Invalid variable display parameters. Default parameters substituted."
msgstr ""
-#: src/data/sys-file-reader.c:858
+#: src/data/sys-file-reader.c:861
#, c-format
msgid "Long variable mapping from %s to invalid variable name `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:868
+#: src/data/sys-file-reader.c:871
#, c-format
msgid "Duplicate long variable name `%s' within system file."
msgstr ""
-#: src/data/sys-file-reader.c:906
+#: src/data/sys-file-reader.c:909
#, c-format
msgid "%s listed as string of length %s in length table."
msgstr ""
-#: src/data/sys-file-reader.c:920
+#: src/data/sys-file-reader.c:923
#, c-format
msgid "Very long string %s overflows dictionary."
msgstr ""
-#: src/data/sys-file-reader.c:967
+#: src/data/sys-file-reader.c:970
#, c-format
msgid "Invalid number of labels: %d. Ignoring labels."
msgstr ""
-#: src/data/sys-file-reader.c:998
+#: src/data/sys-file-reader.c:1001
msgid ""
"Variable index record (type 4) does not immediately follow value label "
"record (type 3) as it should."
msgstr ""
-#: src/data/sys-file-reader.c:1005
+#: src/data/sys-file-reader.c:1008
#, c-format
msgid ""
"Number of variables associated with a value label (%d) is not between 1 and "
"the number of variables (%u)."
msgstr ""
-#: src/data/sys-file-reader.c:1015
+#: src/data/sys-file-reader.c:1018
#, c-format
msgid "Value labels are not allowed on long string variables (%s)."
msgstr ""
-#: src/data/sys-file-reader.c:1022
+#: src/data/sys-file-reader.c:1025
#, c-format
msgid ""
"Variables associated with value label are not all of identical type. "
"Variable %s is %s, but variable %s is %s."
msgstr ""
-#: src/data/sys-file-reader.c:1055
+#: src/data/sys-file-reader.c:1058
#, c-format
msgid "Duplicate value label for %g on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1058
+#: src/data/sys-file-reader.c:1061
#, c-format
msgid "Duplicate value label for \"%.*s\" on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1176
+#: src/data/sys-file-reader.c:1179
msgid "File ends in partial case."
msgstr ""
-#: src/data/sys-file-reader.c:1272 src/data/sys-file-reader.c:1308
+#: src/data/sys-file-reader.c:1275 src/data/sys-file-reader.c:1311
msgid "Compressed data is corrupt."
msgstr ""
-#: src/data/sys-file-reader.c:1381
+#: src/data/sys-file-reader.c:1384
#, c-format
msgid "Variable index %d not in valid range 1...%d."
msgstr ""
-#: src/data/sys-file-reader.c:1386
+#: src/data/sys-file-reader.c:1389
#, c-format
msgid "Variable index %d refers to long string continuation."
msgstr ""
-#: src/data/sys-file-reader.c:1472
+#: src/data/sys-file-reader.c:1475
#, c-format
msgid "Suppressed %d additional variable map warnings."
msgstr ""
-#: src/data/sys-file-reader.c:1485
+#: src/data/sys-file-reader.c:1488
#, c-format
msgid "Variable map refers to unknown variable %s."
msgstr ""
-#: src/data/sys-file-reader.c:1561
+#: src/data/sys-file-reader.c:1564
#, c-format
msgid "System error: %s."
msgstr ""
-#: src/data/sys-file-reader.c:1563
+#: src/data/sys-file-reader.c:1566
#, fuzzy
msgid "Unexpected end of file."
msgstr "plotzlich ist der Datei beendet"
@@ -1367,20 +1367,6 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1400,6 +1386,20 @@
msgstr[0] ""
msgstr[1] ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3018,22 +3018,6 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3058,6 +3042,22 @@
"match the number following (%d)."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -3642,34 +3642,34 @@
"all string."
msgstr ""
-#: src/language/xforms/recode.c:268
+#: src/language/xforms/recode.c:269
msgid "CONVERT requires string input values and numeric output values."
msgstr ""
-#: src/language/xforms/recode.c:386
+#: src/language/xforms/recode.c:387
msgid "expecting output value"
msgstr ""
-#: src/language/xforms/recode.c:435
+#: src/language/xforms/recode.c:436
#, c-format
msgid ""
"%u variable(s) cannot be recoded into %u variable(s). Specify the same "
"number of variables as source and target variables."
msgstr ""
-#: src/language/xforms/recode.c:450
+#: src/language/xforms/recode.c:451
#, c-format
msgid ""
"There is no variable named %s. (All string variables specified on INTO must "
"already exist. Use the STRING command to create a string variable.)"
msgstr ""
-#: src/language/xforms/recode.c:465
+#: src/language/xforms/recode.c:466
#, c-format
msgid "INTO is required with %s input values and %s output values."
msgstr ""
-#: src/language/xforms/recode.c:478
+#: src/language/xforms/recode.c:479
#, c-format
msgid "Type mismatch. Cannot store %s data in %s variable %s."
msgstr ""
@@ -4651,18 +4651,6 @@
msgid "%d"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr "Spezial"
-
#: src/ui/gui/psppire.glade:11
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -4837,6 +4825,18 @@
msgid "Functions:"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr "Spezial"
+
#: src/ui/gui/syntax-editor.c:80
#, c-format
msgid "Save contents of syntax editor to %s?"
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- po/pspp.pot 16 Apr 2007 03:59:32 -0000 1.130
+++ po/pspp.pot 16 Apr 2007 10:49:31 -0000 1.131
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-04-15 20:40-0700\n"
+"POT-Creation-Date: 2007-04-16 18:39+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -319,8 +319,8 @@
msgid "Numeric"
msgstr ""
-#: src/data/format.c:311 src/data/sys-file-reader.c:1026
-#: src/data/sys-file-reader.c:1028
+#: src/data/format.c:311 src/data/sys-file-reader.c:1029
+#: src/data/sys-file-reader.c:1031
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
@@ -328,8 +328,8 @@
msgid "numeric"
msgstr ""
-#: src/data/format.c:311 src/data/sys-file-reader.c:1026
-#: src/data/sys-file-reader.c:1028
+#: src/data/format.c:311 src/data/sys-file-reader.c:1029
+#: src/data/sys-file-reader.c:1031
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
@@ -679,104 +679,104 @@
msgid "Bad size (%u) or count (%u) on extension 11."
msgstr ""
-#: src/data/sys-file-reader.c:819
+#: src/data/sys-file-reader.c:823
msgid "Invalid variable display parameters. Default parameters substituted."
msgstr ""
-#: src/data/sys-file-reader.c:858
+#: src/data/sys-file-reader.c:861
#, c-format
msgid "Long variable mapping from %s to invalid variable name `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:868
+#: src/data/sys-file-reader.c:871
#, c-format
msgid "Duplicate long variable name `%s' within system file."
msgstr ""
-#: src/data/sys-file-reader.c:906
+#: src/data/sys-file-reader.c:909
#, c-format
msgid "%s listed as string of length %s in length table."
msgstr ""
-#: src/data/sys-file-reader.c:920
+#: src/data/sys-file-reader.c:923
#, c-format
msgid "Very long string %s overflows dictionary."
msgstr ""
-#: src/data/sys-file-reader.c:967
+#: src/data/sys-file-reader.c:970
#, c-format
msgid "Invalid number of labels: %d. Ignoring labels."
msgstr ""
-#: src/data/sys-file-reader.c:998
+#: src/data/sys-file-reader.c:1001
msgid ""
"Variable index record (type 4) does not immediately follow value label "
"record (type 3) as it should."
msgstr ""
-#: src/data/sys-file-reader.c:1005
+#: src/data/sys-file-reader.c:1008
#, c-format
msgid ""
"Number of variables associated with a value label (%d) is not between 1 and "
"the number of variables (%u)."
msgstr ""
-#: src/data/sys-file-reader.c:1015
+#: src/data/sys-file-reader.c:1018
#, c-format
msgid "Value labels are not allowed on long string variables (%s)."
msgstr ""
-#: src/data/sys-file-reader.c:1022
+#: src/data/sys-file-reader.c:1025
#, c-format
msgid ""
"Variables associated with value label are not all of identical type. "
"Variable %s is %s, but variable %s is %s."
msgstr ""
-#: src/data/sys-file-reader.c:1055
+#: src/data/sys-file-reader.c:1058
#, c-format
msgid "Duplicate value label for %g on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1058
+#: src/data/sys-file-reader.c:1061
#, c-format
msgid "Duplicate value label for \"%.*s\" on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1176
+#: src/data/sys-file-reader.c:1179
msgid "File ends in partial case."
msgstr ""
-#: src/data/sys-file-reader.c:1272 src/data/sys-file-reader.c:1308
+#: src/data/sys-file-reader.c:1275 src/data/sys-file-reader.c:1311
msgid "Compressed data is corrupt."
msgstr ""
-#: src/data/sys-file-reader.c:1381
+#: src/data/sys-file-reader.c:1384
#, c-format
msgid "Variable index %d not in valid range 1...%d."
msgstr ""
-#: src/data/sys-file-reader.c:1386
+#: src/data/sys-file-reader.c:1389
#, c-format
msgid "Variable index %d refers to long string continuation."
msgstr ""
-#: src/data/sys-file-reader.c:1472
+#: src/data/sys-file-reader.c:1475
#, c-format
msgid "Suppressed %d additional variable map warnings."
msgstr ""
-#: src/data/sys-file-reader.c:1485
+#: src/data/sys-file-reader.c:1488
#, c-format
msgid "Variable map refers to unknown variable %s."
msgstr ""
-#: src/data/sys-file-reader.c:1561
+#: src/data/sys-file-reader.c:1564
#, c-format
msgid "System error: %s."
msgstr ""
-#: src/data/sys-file-reader.c:1563
+#: src/data/sys-file-reader.c:1566
msgid "Unexpected end of file."
msgstr ""
@@ -1362,20 +1362,6 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1395,6 +1381,20 @@
msgstr[0] ""
msgstr[1] ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3012,22 +3012,6 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3052,6 +3036,22 @@
"match the number following (%d)."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -4625,18 +4625,6 @@
msgid "%d"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr ""
-
#: src/ui/gui/psppire.glade:11
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -4800,6 +4788,18 @@
msgid "Functions:"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr ""
+
#: src/ui/gui/syntax-editor.c:80
#, c-format
msgid "Save contents of syntax editor to %s?"
Index: src/data/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- src/data/ChangeLog 30 Mar 2007 16:40:52 -0000 1.109
+++ src/data/ChangeLog 16 Apr 2007 10:49:32 -0000 1.110
@@ -1,3 +1,9 @@
+2007-04-16 John Darrington <address@hidden>
+
+ * sys-file-reader.c: Some versions of Other Software seem to
+ produce system files with string variables' measure set to
+ zero. We'll assume these are supposed to be nominal variables.
+
2007-03-30 Ben Pfaff <address@hidden>
* procedure.c: Adapt to new deque data structure.
Index: src/data/sys-file-reader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/data/sys-file-reader.c 9 Feb 2007 05:19:08 -0000 1.32
+++ src/data/sys-file-reader.c 16 Apr 2007 10:49:32 -0000 1.33
@@ -811,7 +811,11 @@
int measure = read_int32 (r);
int width = read_int32 (r);
int align = read_int32 (r);
- struct variable *v;
+ struct variable *v = dict_get_var (dict, i);
+
+ /* spss v14 sometimes seems to set string variables' measure to zero */
+ if ( 0 == measure && var_is_alpha (v) ) measure = 1;
+
if (measure < 1 || measure > 3 || align < 0 || align > 2)
{
@@ -822,7 +826,6 @@
continue;
}
- v = dict_get_var (dict, i);
var_set_measure (v, (measure == 1 ? MEASURE_NOMINAL
: measure == 2 ? MEASURE_ORDINAL
: MEASURE_SCALE));
Index: src/language/stats/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/language/stats/ChangeLog 12 Apr 2007 22:40:53 -0000 1.49
+++ src/language/stats/ChangeLog 16 Apr 2007 10:49:32 -0000 1.50
@@ -1,3 +1,10 @@
+2007-04-16 John Darrington <address@hidden>
+
+ * t-test.q: Changed the output width of reported counts and
+ degrees of freedom, to avoid truncating these values. Thanks
+ to Seth Woolley for reporting this problem. A proper fix involves
+ re-thinking the output driver.
+
2007-04-12 Jason Stover <address@hidden>
* regression.q (run_regression): Added if (n_data >0) to fix bug
Index: src/language/stats/t-test.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/t-test.q,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/language/stats/t-test.q 2 Apr 2007 08:55:52 -0000 1.21
+++ src/language/stats/t-test.q 16 Apr 2007 10:49:32 -0000 1.22
@@ -799,7 +799,7 @@
gs = hsh_find(grp_hash, (void *) &search_val);
assert(gs);
- tab_float(ssb->t, 2 ,i*2+count+1, TAB_RIGHT, gs->n, 2, 0);
+ tab_float(ssb->t, 2 ,i*2+count+1, TAB_RIGHT, gs->n, 10, 0);
tab_float(ssb->t, 3 ,i*2+count+1, TAB_RIGHT, gs->mean, 8, 2);
tab_float(ssb->t, 4 ,i*2+count+1, TAB_RIGHT, gs->std_dev, 8, 3);
tab_float(ssb->t, 5 ,i*2+count+1, TAB_RIGHT, gs->se_mean, 8, 3);
@@ -859,7 +859,7 @@
/* Values */
tab_float (ssb->t,2, i*2+j+1, TAB_RIGHT, pairs[i].mean[j], 8, 2);
- tab_float (ssb->t,3, i*2+j+1, TAB_RIGHT, pairs[i].n, 2, 0);
+ tab_float (ssb->t,3, i*2+j+1, TAB_RIGHT, pairs[i].n, 10, 0);
tab_float (ssb->t,4, i*2+j+1, TAB_RIGHT, pairs[i].std_dev[j], 8, 3);
tab_float (ssb->t,5, i*2+j+1, TAB_RIGHT,
pairs[i].std_dev[j]/sqrt(pairs[i].n), 8, 3);
@@ -880,7 +880,7 @@
struct group_statistics *gs = &group_proc_get (cmd->v_variables[i])->ugs;
tab_text (ssb->t, 0, i+1, TAB_LEFT, var_get_name (cmd->v_variables[i]));
- tab_float (ssb->t,1, i+1, TAB_RIGHT, gs->n, 2, 0);
+ tab_float (ssb->t,1, i+1, TAB_RIGHT, gs->n, 10, 0);
tab_float (ssb->t,2, i+1, TAB_RIGHT, gs->mean, 8, 2);
tab_float (ssb->t,3, i+1, TAB_RIGHT, gs->std_dev, 8, 2);
tab_float (ssb->t,4, i+1, TAB_RIGHT, gs->se_mean, 8, 3);
@@ -1052,7 +1052,7 @@
tab_float(self->t, 3, i*2+3, TAB_CENTER, q, 8,3 );
df = gs0->n + gs1->n - 2.0 ;
- tab_float (self->t, 5, i*2+3, TAB_RIGHT, df, 2, 0);
+ tab_float (self->t, 5, i*2+3, TAB_RIGHT, df, 10, 0);
pooled_variance = ( (gs0->n )*pow2(gs0->s_std_dev)
+
@@ -1225,7 +1225,7 @@
tab_float(trb->t, 7, i+3, TAB_RIGHT, t , 8,3 );
/* Degrees of freedom */
- tab_float(trb->t, 8, i+3, TAB_RIGHT, df , 2, 0 );
+ tab_float(trb->t, 8, i+3, TAB_RIGHT, df , 10, 0 );
p = gsl_cdf_tdist_P(t,df);
q = gsl_cdf_tdist_P(t,df);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po po/pspp.pot src/data/ChangeLog sr...,
John Darrington <=