Fix bug #19604. T-Test documentation now matches code; code matches spss behaviour

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 80eec83aaa7ee8dc14bbad94eeb763b5e0f90705..4effc07982455cc6a79772d7b846a06fafe58494 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-28 John Darrington <john@darrington.wattle.id.au>
+
+       * statistics.texi: Made the documentation for T-TEST match 
+       the behaviour.
+
 2007-07-17  Ben Pfaff  <blp@gnu.org>
 
        * get-commands.pl: Use strict and all warnings.  Simplify

diff --git a/doc/statistics.texi b/doc/statistics.texi
index 7c141fa50068c555789c2f4e82fdfc1ca6860fe6..8db018f7854dc17079aed77bfc4e9acf22ee9961 100644 (file)
--- a/doc/statistics.texi
+++ b/doc/statistics.texi
@@ -702,8 +702,8 @@ of 1.0 and 2.0 are assumed.
 If the independent variable is numeric, 
 it is acceptable to specify only one value inside the parentheses.
 If you do this, cases where the independent variable is
-less than  or equal to this value belong to the first group, and cases
-greater than this value belong to the second group.
+greater than or equal to this value belong to the first group, and cases
+less than this value belong to the second group.
 When using this form of the @cmd{GROUPS} subcommand, missing values in
 the independent variable are excluded on a listwise basis, regardless
 of whether @cmd{/MISSING=LISTWISE} was specified.

diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 574b958d5309b40243143799f776b59eeeaa3adf..4456d8f2cb688208dc07d47a025a0b4fee4aa072 100644 (file)
--- a/src/language/stats/ChangeLog
+++ b/src/language/stats/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-28 John Darrington <john@darrington.wattle.id.au>
+
+       * t-test.q: Moved the order in which groups are displayed in the 
+       independent samples case, where a cut point is given.
+
 2007-07-27  Ben Pfaff  <blp@gnu.org>
 
        * regression.q (run_regression): Move casereader_destroy call so

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index 2e14632dc9b4f698b3fec8e2cf2c63331b81a5f1..9691578e7fdd6835e1cd980435f7af6903b3584b 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -736,8 +736,8 @@ ssbox_independent_samples_populate(struct ssbox *ssb,
 
   if (gp.criterion == CMP_LE )
     {
-      strcpy(prefix[0],"< ");
-      strcpy(prefix[1],">=");
+      strcpy(prefix[0],">=");
+      strcpy(prefix[1],"<");
       indep_value[0] = gp.v.critical_value;
       indep_value[1] = gp.v.critical_value;
     }
@@ -785,13 +785,13 @@ ssbox_independent_samples_populate(struct ssbox *ssb,
            {
              if ( count == 0 )
                {
-                 /*  less than ( < )  case */
-                 search_val.f = gp.v.critical_value - 1.0;
+                 /* >= case  */
+                 search_val.f = gp.v.critical_value + 1.0;
                }
              else
                {
-                 /* >= case  */
-                 search_val.f = gp.v.critical_value + 1.0;
+                 /*  less than ( < )  case */
+                 search_val.f = gp.v.critical_value - 1.0;
                }
            }
          else
@@ -1688,7 +1688,6 @@ group_precalc (struct cmd_t_test *cmd )
            }
 
          hsh_insert ( ttpr->group_hash, (void *) gs );
-
        }
     }
 
@@ -1867,7 +1866,7 @@ compare_group_binary(const struct group_statistics *a,
 
   if ( p->criterion == CMP_LE )
     {
-      /* less-than-or-equal comparision is not meaningfull for
+      /* less-than comparision is not meaningfull for
         alpha variables, so we shouldn't ever arrive here */
       assert(p->indep_width == 0 ) ;
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2b9cf8087cef99e789bc65ca516ef9cd39a0ff50..01e6ff336e62da0847f336ec24e94f9174242175 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-28 John Darrington <john@darrington.wattle.id.au>
+
+       * command/t-test-1-indep-val.sh: Changed the order of groups in the 
+       summary box to match new behaviour. (Fixes bug #19604).
+
 2007-07-25  Ben Pfaff  <blp@gnu.org>
 
        Fix bug #17100.

diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index d524b159818bc20bd0617404b48e78ac8f1abe5e..375167ccf347eff9c9421eec8f57ab88b219b65b 100755 (executable)
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -104,8 +104,8 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 #===========#==#====#==============#========#
 #     INDEP | N|Mean|Std. Deviation|SE. Mean#
 #===========#==#====#==============#========#
-#DEP < 1.514|11|8.00|         2.864|    .863#
-#    >=1.514|11|9.00|         3.821|   1.152#
+#DEP >=1.514|11|9.00|         3.821|   1.152#
+#    <1.514 |11|8.00|         2.864|    .863#
 #===========#==#====#==============#========#
 2.2 T-TEST.  Independent Samples Test
 #==============================#=========#===============================================================================#