Change type of variables whose addresses are passed to dict_get_vars()

[pspp-builds.git] / src / t-test.q

diff --git a/src/t-test.q b/src/t-test.q
index 2e10a2b04bad6459630ddbfc8d2635d7da0fe6bb..89f1741f33e5240d1f259e38e9bda4220840a248 100644 (file)
--- a/src/t-test.q
+++ b/src/t-test.q
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <gsl/gsl_cdf.h>
@@ -43,6 +43,10 @@
 #include "group_proc.h"
 #include "casefile.h"
 #include "levene.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* (headers) */
 
 /* (specification)
@@ -63,7 +67,7 @@
 
 
 /* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func *value_is_missing;
 
 /* Variable for the GROUPS subcommand, if given. */
 static struct variable *indep_var;
@@ -326,9 +330,9 @@ cmd_t_test(void)
 
   /* If /MISSING=INCLUDE is set, then user missing values are ignored */
   if (cmd.incl == TTS_INCLUDE ) 
-    value_is_missing = is_system_missing;
+    value_is_missing = mv_is_value_system_missing;
   else
-    value_is_missing = is_missing;
+    value_is_missing = mv_is_value_missing;
 
   bad_weight_warn = 1;
 
@@ -360,14 +364,6 @@ tts_custom_groups (struct cmd_t_test *cmd UNUSED)
 
   lex_match('=');
 
-  if (token != T_ALL && 
-      (token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
-     ) 
-  {
-    msg(SE,_("`%s' is not a variable name"),tokid);
-    return 0;
-  }
-
   indep_var = parse_variable ();
   if (!indep_var)
     {
@@ -453,13 +449,6 @@ tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
 
   lex_match('=');
 
-  if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
-      && token != T_ALL)
-    {
-      msg(SE,_("`%s' is not a variable name"),tokid);
-      return 0;
-    }
-
   n_vars=0;
   if (!parse_variables (default_dict, &vars, &n_vars,
                        PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH))
@@ -1429,7 +1418,7 @@ common_calc (const struct ccase *c, void *_cmd)
          struct variable *v = cmd->v_variables[i];
          const union value *val = case_data (c, v->fv);
 
-         if (value_is_missing(val,v) )
+         if (value_is_missing(&v->miss, val) )
            {
              return 0;
            }
@@ -1440,7 +1429,7 @@ common_calc (const struct ccase *c, void *_cmd)
   if ( cmd->sbc_groups )
     {
       const union value *gv = case_data (c, indep_var->fv);
-      if ( value_is_missing(gv,indep_var) )
+      if ( value_is_missing(&indep_var->miss, gv) )
        {
          return 0;
        }
@@ -1455,7 +1444,7 @@ common_calc (const struct ccase *c, void *_cmd)
 
       gs= &group_proc_get (cmd->v_variables[i])->ugs;
 
-      if (! value_is_missing(val,v) )
+      if (! value_is_missing(&v->miss, val) )
        {
          gs->n+=weight;
          gs->sum+=weight * val->f;
@@ -1528,7 +1517,7 @@ one_sample_calc (const struct ccase *c, void *cmd_)
          struct variable *v = cmd->v_variables[i];
          const union value *val = case_data (c, v->fv);
 
-         if (value_is_missing(val,v) )
+         if (value_is_missing(&v->miss, val) )
            {
              return 0;
            }
@@ -1543,7 +1532,7 @@ one_sample_calc (const struct ccase *c, void *cmd_)
 
       gs= &group_proc_get (cmd->v_variables[i])->ugs;
       
-      if ( ! value_is_missing(val,v))
+      if ( ! value_is_missing(&v->miss, val))
        gs->sum_diff += weight * (val->f - cmd->n_testval[0]);
     }
 
@@ -1622,8 +1611,8 @@ paired_calc (const struct ccase *c, void *cmd_)
          const union value *val0 = case_data (c, v0->fv);
          const union value *val1 = case_data (c, v1->fv);
          
-         if ( value_is_missing(val0,v0) ||
-              value_is_missing(val1,v1) )
+         if ( value_is_missing(&v0->miss, val0) ||
+              value_is_missing(&v1->miss, val1) )
            {
              return 0;
            }
@@ -1638,7 +1627,8 @@ paired_calc (const struct ccase *c, void *cmd_)
       const union value *val0 = case_data (c, v0->fv);
       const union value *val1 = case_data (c, v1->fv);
 
-      if ( ( !value_is_missing(val0,v0) && !value_is_missing(val1,v1) ) )
+      if ( ( !value_is_missing(&v0->miss, val0)
+             && !value_is_missing(&v1->miss, val1) ) )
       {
        pairs[i].n += weight;
        pairs[i].sum[0] += weight * val0->f;
@@ -1755,7 +1745,7 @@ group_calc (const struct ccase *c, struct cmd_t_test *cmd)
 
   const double weight = dict_get_case_weight(default_dict,c,&bad_weight_warn);
 
-  if ( value_is_missing(gv,indep_var) )
+  if ( value_is_missing(&indep_var->miss, gv) )
     {
       return 0;
     }
@@ -1767,7 +1757,7 @@ group_calc (const struct ccase *c, struct cmd_t_test *cmd)
          struct variable *v = cmd->v_variables[i];
          const union value *val = case_data (c, v->fv);
 
-         if (value_is_missing(val,v) )
+         if (value_is_missing(&v->miss, val) )
            {
              return 0;
            }
@@ -1790,7 +1780,7 @@ group_calc (const struct ccase *c, struct cmd_t_test *cmd)
       if ( ! gs ) 
        return 0;
 
-      if ( !value_is_missing(val,var) )
+      if ( !value_is_missing(&var->miss, val) )
        {
          gs->n+=weight;
          gs->sum+=weight * val->f;
@@ -1917,6 +1907,8 @@ calculate(const struct casefile *cf, void *cmd_)
 
 }
 
+short which_group(const struct group_statistics *g,
+                 const struct group_properties *p);
 
 /* Return -1 if the id of a is less than b; +1 if greater than and 
    0 if equal */
@@ -1925,26 +1917,28 @@ compare_group_binary(const struct group_statistics *a,
                     const struct group_statistics *b, 
                     const struct group_properties *p)
 {
-  
   short flag_a;
   short flag_b;
-
+  
   if ( p->criterion == CMP_LE ) 
     {
+      /* less-than-or-equal comparision is not meaningfull for
+        alpha variables, so we shouldn't ever arrive here */
       assert(p->indep_width == 0 ) ;
+      
       flag_a = ( a->id.f < p->v.critical_value ) ;
       flag_b = ( b->id.f < p->v.critical_value ) ;
     }
   else
     {
-      flag_a = ( a->id.f == p->v.critical_value ) ;
-      flag_b = ( b->id.f == p->v.critical_value ) ;
+      flag_a = which_group(a, p);
+      flag_b = which_group(b, p);
     }
 
-  if ( flag_a == flag_b) 
-    return 0 ;
-  
-  return ( flag_a < flag_b);
+  if (flag_a < flag_b ) 
+    return -1;
+
+  return (flag_a > flag_b);
 }
 
 /* This is a degenerate case of a hash, since it can only return three possible
@@ -1964,15 +1958,28 @@ hash_group_binary(const struct group_statistics *g,
     }
   else if ( p->criterion == CMP_EQ) 
     {
-      if ( 0 == compare_values (&g->id, &p->v.g_value[0], p->indep_width ))
-       flag = 0 ;
-      else if ( 0 == compare_values (&g->id, &p->v.g_value[1], p->indep_width ))
-       flag = 1 ;
-      else
-       flag = 2 ;
+      flag = which_group(g,p);
     }
   else
     assert(0);
 
   return flag;
 }
+
+/* return 0 if G belongs to group 0, 
+          1 if it belongs to group 1,
+         2 if it belongs to neither group */
+short
+which_group(const struct group_statistics *g,
+           const struct group_properties *p)
+{
+ 
+  if ( 0 == compare_values (&g->id, &p->v.g_value[0], p->indep_width))
+    return 0;
+
+  if ( 0 == compare_values (&g->id, &p->v.g_value[1], p->indep_width))
+    return 1;
+
+  return 2;
+}
+