T-TEST: Use correct keyword CI (instead of CIN) on CRITERIA subcommand.

Reported by Douglas Bonett <dgbonett@ucsc.edu>.

diff --git a/doc/statistics.texi b/doc/statistics.texi
index 1e24c173516bcfa62ebb8d8af0ad432e3d1d9a34..60d665311c491c8263185bb83b38f741c114b0b1 100644 (file)
--- a/doc/statistics.texi
+++ b/doc/statistics.texi
@@ -1442,7 +1442,7 @@ of variable preceding @subcmd{WITH} against variable following
 @display
 T-TEST
         /MISSING=@{ANALYSIS,LISTWISE@} @{EXCLUDE,INCLUDE@}
-        /CRITERIA=CIN(@var{confidence})
+        /CRITERIA=CI(@var{confidence})
 
 
 (One Sample mode.)

diff --git a/src/language/stats/t-test-parser.c b/src/language/stats/t-test-parser.c
index 9e134e2a72372f79f7d57f59df04a102f402771a..6b14adbdb35ff4c6b072583a54c1ba2104f730ce 100644 (file)
--- a/src/language/stats/t-test-parser.c
+++ b/src/language/stats/t-test-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -272,7 +272,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
       else if (lex_match_id (lexer, "CRITERIA"))
        {
           lex_match (lexer, T_EQUALS);
-         if ( lex_force_match_id (lexer, "CIN"))
+         if ( lex_force_match_id (lexer, "CI"))
            if ( lex_force_match (lexer, T_LPAREN))
              {
                lex_force_num (lexer);

diff --git a/src/ui/gui/t-test-options.c b/src/ui/gui/t-test-options.c
index 116c543f9476b857726be6e099a7fb511412cbb9..19dda18caf5ef656020b6fcdda1c86922ff4b396 100644 (file)
--- a/src/ui/gui/t-test-options.c
+++ b/src/ui/gui/t-test-options.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2012  Free Software Foundation
+   Copyright (C) 2007, 2012, 2015  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -139,7 +139,7 @@ tt_options_dialog_append_syntax (const struct tt_options_dialog *tto, GString *s
   else
     ds_put_cstr (&dss, "LISTWISE");
 
-  ds_put_c_format (&dss, "\n\t/CRITERIA=CIN(%g)",
+  ds_put_c_format (&dss, "\n\t/CRITERIA=CI(%g)",
                   tto->confidence_interval/100.0);
 
   g_string_append (str, ds_cstr (&dss));

diff --git a/tests/language/stats/t-test.at b/tests/language/stats/t-test.at
index efd69e5da38f227d01fda6f58d74baacc652c376..9212fa771db4c815b161f0e7bd8a2d652a730440 100644 (file)
--- a/tests/language/stats/t-test.at
+++ b/tests/language/stats/t-test.at
@@ -98,7 +98,7 @@ begin data.
 end data.
 
 
-t-test /MISSING=analysis /PAIRS a c with b d (PAIRED) /CRITERIA=CIN(0.95). 
+t-test /MISSING=analysis /PAIRS a c with b d (PAIRED) /CRITERIA=CI(0.95).
 ])
 
 AT_CHECK([pspp -o missing.csv missing.sps])
@@ -190,7 +190,7 @@ WEIGHT BY w.
 T-TEST
         PAIRS =  y WITH  x (PAIRED)
         /MISSING=ANALYSIS
-        /CRITERIA=CIN(0.95).
+        /CRITERIA=CI(0.95).
 ])
 
 AT_CHECK([pspp -O format=csv t-test.sps], [0], [dnl