X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Foneway.q;h=8c9c768a87bc6266e5b849521c8e6c0db3cbf26b;hb=27b7805829c01dec0507bc2afac9c6bfbf25c957;hp=71f5f08730cd0af78e17734f499e516135ce1812;hpb=1195caf0c998e80d3e7195a0452a14e7b4194077;p=pspp

diff --git a/src/oneway.q b/src/oneway.q
index 71f5f08730..8c9c768a87 100644
--- a/src/oneway.q
+++ b/src/oneway.q
@@ -43,6 +43,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "group_proc.h"
 #include "group.h"
 #include "levene.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* (headers) */
 
 /* (specification)
@@ -83,7 +87,7 @@ static int ostensible_number_of_groups=-1;
 
 
 /* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func *value_is_missing;
 
 
 static void run_oneway(const struct casefile *cf, void *_mode);
@@ -115,9 +119,9 @@ cmd_oneway(void)
 
   /* If /MISSING=INCLUDE is set, then user missing values are ignored */
   if (cmd.incl == ONEWAY_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;
 
   /* What statistics were requested */
   if ( cmd.sbc_statistics ) 
@@ -290,7 +294,7 @@ show_anova_table(void)
       struct hsh_iterator g;
       struct group_statistics *gs;
       double ssa=0;
-
+      const char *s = var_to_string(vars[i]);
 
       for (gs =  hsh_first (group_hash,&g); 
 	   gs != 0; 
@@ -301,8 +305,6 @@ show_anova_table(void)
       
       ssa -= ( totals->sum * totals->sum ) / totals->n ;
 
-      const char *s = var_to_string(vars[i]);
-
       tab_text (t, 0, i * 3 + 1, TAB_LEFT | TAT_TITLE, s);
       tab_text (t, 1, i * 3 + 1, TAB_LEFT | TAT_TITLE, _("Between Groups"));
       tab_text (t, 1, i * 3 + 2, TAB_LEFT | TAT_TITLE, _("Within Groups"));
@@ -425,7 +427,7 @@ show_descriptives(void)
 
       const char *s = var_to_string(vars[v]);
 
-      struct group_statistics **gs_array = hsh_sort(gp->group_hash);
+      struct group_statistics *const *gs_array = hsh_sort(gp->group_hash);
       int count = 0;
 
       tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s);
@@ -576,7 +578,7 @@ show_contrast_coeffs(short *bad_contrast)
   int n_rows = 2 + cmd.sbc_contrast;
   union value *group_value;
   int count = 0 ;      
-  void **group_values ;
+  void *const *group_values ;
 
   struct tab_table *t;
 
@@ -700,8 +702,8 @@ show_contrast_tests(short *bad_contrast)
 	  double coef_msq = 0.0;
 	  struct group_proc *grp_data = group_proc_get (vars[v]);
 	  struct hsh_table *group_hash = grp_data->group_hash;
-	  struct group_statistics *gs;
-	  void **group_stat_array;
+
+	  void *const *group_stat_array;
 
 	  double T;
 	  double std_error_contrast ;
@@ -748,9 +750,9 @@ show_contrast_tests(short *bad_contrast)
 	  
 	  for (ci = 0 ; ci < hsh_count(group_hash) ;  ++ci)
 	    {
-	      gs = group_stat_array[ci];
-	      
-	      const double coef = subc_list_double_at(&cmd.dl_contrast[i],ci);
+	      const double coef = subc_list_double_at(&cmd.dl_contrast[i], ci);
+	      struct group_statistics *gs = group_stat_array[ci];
+
 	      const double winv = (gs->std_dev * gs->std_dev) / gs->n;
 
 	      contrast_value += coef * gs->mean;
@@ -911,7 +913,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
       const union value *indep_val = case_data (&c, indep_var->fv);
 
       /* Deal with missing values */
-      if ( value_is_missing(indep_val,indep_var) )
+      if ( value_is_missing(&indep_var->miss, indep_val) )
 	continue;
 
       /* Skip the entire case if /MISSING=LISTWISE is set */
@@ -922,7 +924,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
 	      const struct variable *v = vars[i];
 	      const union value *val = case_data (&c, v->fv);
 
-	      if (value_is_missing(val,v) )
+	      if (value_is_missing(&v->miss, val) )
 		break;
 	    }
 	  if ( i != n_vars ) 
@@ -962,7 +964,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
 	      hsh_insert ( group_hash, (void *) gs );
 	    }
 	  
-	  if (! value_is_missing(val,v) )
+	  if (! value_is_missing(&v->miss, val) )
 	    {
 	      struct group_statistics *totals = &gp->ugs;