X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Foneway.c;h=a67493ec4a048b1ec5398c9a93722c4f55a03a7b;hb=2fa50c14e54abe7095b53f6a790f19d90f20987b;hp=480bbb91379be3dd162c239b03b941b0b5e30ff7;hpb=970789e054086189cb8d83b8c80f6c10318bbeef;p=pspp

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index 480bbb9137..a67493ec4a 100644
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -164,6 +164,9 @@ df_individual (const struct per_var_ws *pvw UNUSED, const struct moments1 *mom_i
 
   moments1_calculate (mom_i, &n_i, NULL, &var_i, 0, 0);  
   moments1_calculate (mom_j, &n_j, NULL, &var_j, 0, 0);
+  
+  if ( n_i <= 1.0 || n_j <= 1.0)
+    return SYSMIS;
 
   nom = pow2 (var_i/n_i + var_j/n_j);
   denom = pow2 (var_i/n_i) / (n_i - 1) + pow2 (var_j/n_j) / (n_j - 1);
@@ -191,6 +194,9 @@ static double sidak_pinv (double std_err, double alpha, double df, int k, const
 
 static double tukey_pinv (double std_err, double alpha, double df, int k, const struct moments1 *mom_i UNUSED, const struct moments1 *mom_j UNUSED)
 {
+  if ( k < 2 || df < 2)
+    return SYSMIS;
+
   return std_err / sqrt (2.0)  * qtukey (1 - alpha, 1.0, k, df, 1, 0);
 }
 
@@ -211,6 +217,9 @@ static double gh_pinv (double std_err UNUSED, double alpha, double df, int k, co
 
   m = sqrt ((var_i/n_i + var_j/n_j) / 2.0);
 
+  if ( k < 2 || df < 2)
+    return SYSMIS;
+
   return m * qtukey (1 - alpha, 1.0, k, df, 1, 0);
 }
 
@@ -224,6 +233,8 @@ multiple_comparison_sig (double std_err,
   int k = pvw->n_groups;
   double df = ph->dff (pvw, dd_i->mom, dd_j->mom);
   double ts = ph->tsf (k, dd_i->mom, dd_j->mom, std_err);
+  if ( df == SYSMIS)
+    return SYSMIS;
   return  ph->p1f (ts, k - 1, df);
 }
 
@@ -232,13 +243,20 @@ mc_half_range (const struct oneway_spec *cmd, const struct per_var_ws *pvw, doub
 {
   int k = pvw->n_groups;
   double df = ph->dff (pvw, dd_i->mom, dd_j->mom);
+  if ( df == SYSMIS)
+    return SYSMIS;
 
   return ph->pinv (std_err, cmd->alpha, df, k, dd_i->mom, dd_j->mom);
 }
 
 static double tukey_1tailsig (double ts, double df1, double df2)
 {
-  double twotailedsig = 1.0 - ptukey (ts, 1.0, df1 + 1, df2, 1, 0);
+  double twotailedsig;
+
+  if (df2 < 2 || df1 < 1)
+    return SYSMIS;
+
+  twotailedsig = 1.0 - ptukey (ts, 1.0, df1 + 1, df2, 1, 0);
 
   return twotailedsig / 2.0;
 }
@@ -586,8 +604,7 @@ makeit (const void *aux1, void *aux2 UNUSED)
 
 static void 
 updateit (const void *aux1, void *aux2, void *user_data,
-	    const struct ccase *c, enum mv_class exclude,
-	    const struct variable *wv)
+	  const struct ccase *c, double weight)
 {
   struct descriptive_data *dd = user_data;
 
@@ -597,13 +614,6 @@ updateit (const void *aux1, void *aux2, void *user_data,
 
   struct descriptive_data *dd_total = aux2;
 
-  double weight;
-
-  if ( var_is_value_missing (varp, valx, exclude))
-    return;
-
-  weight = wv != NULL ? case_data (c, wv)->f : 1.0;
-
   moments1_add (dd->mom, valx->f, weight);
   if (valx->f < dd->minimum)
     dd->minimum = valx->f;
@@ -654,6 +664,7 @@ run_oneway (const struct oneway_spec *cmd,
       struct payload payload;
       payload.create = makeit;
       payload.update = updateit;
+      payload.destroy = NULL;
 
       ws.vws[v].cat = categoricals_create (&inter, 1, cmd->wv,
                                            cmd->exclude);