more summary testing

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 57e547376ac639da1e1aec5a8a70802e12789d8d..b2274f3e44d2d3abc2f5644086385eba27ce4b93 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -2551,11 +2551,14 @@ ctables_summary_init (union ctables_summary *s,
       break;
 
     case CTSF_MEAN:
+    case CTSF_SUM:
+    case CTSF_areaPCT_SUM:
+      s->moments = moments1_create (MOMENT_MEAN);
+      break;
+
     case CTSF_SEMEAN:
     case CTSF_STDDEV:
-    case CTSF_SUM:
     case CTSF_VARIANCE:
-    case CTSF_areaPCT_SUM:
       s->moments = moments1_create (MOMENT_VARIANCE);
       break;
 
@@ -2714,11 +2717,15 @@ ctables_summary_add (union ctables_summary *s,
     case CTSF_STDDEV:
     case CTSF_SUM:
     case CTSF_VARIANCE:
-    case CTSF_areaPCT_SUM:
       if (!is_scale_missing)
         moments1_add (s->moments, value->f, ss->weighted ? e_weight : 1.0);
       break;
 
+    case CTSF_areaPCT_SUM:
+      if (!is_missing && !is_scale_missing)
+        moments1_add (s->moments, value->f, ss->weighted ? e_weight : 1.0);
+      break;
+
     case CTSF_MEDIAN:
     case CTSF_MODE:
     case CTSF_PTILE:
@@ -3726,8 +3733,8 @@ ctables_table_add_section (struct ctables_table *t, enum pivot_axis_type a,
             for (size_t i = 0; i < nest->n; i++)
               hmap_init (&s->occurrences[a][i]);
         }
-      for (size_t i = 0; i < N_CTATS; i++)
-        hmap_init (&s->areas[i]);
+      for (enum ctables_area_type at = 0; at < N_CTATS; at++)
+        hmap_init (&s->areas[at]);
     }
 }
 
@@ -4665,96 +4672,67 @@ ctables_prepare_table (struct ctables_table *t)
                 nest->areas[at] = xmalloc (nest->n * sizeof *nest->areas[at]);
                 nest->n_areas[at] = 0;
 
-                bool add_vars = (at == CTAT_LAYER ? a == PIVOT_AXIS_LAYER
-                                 : at == CTAT_LAYERROW ? a != PIVOT_AXIS_COLUMN
-                                 : at == CTAT_LAYERCOL ? a != PIVOT_AXIS_ROW
-                                 : at == CTAT_TABLE ? false
-                                 : true);
-                if (add_vars)
-                  for (size_t k = 0; k < nest->n; k++)
-                    {
-                      if (k == nest->scale_idx)
-                        continue;
-                      nest->areas[at][nest->n_areas[at]++] = k;
-                    }
-                else if ((at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a)
-                         || (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
-                         || (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER))
+                enum pivot_axis_type ata, atb;
+                if (at == CTAT_ROW || at == CTAT_LAYERROW)
+                  {
+                    ata = PIVOT_AXIS_ROW;
+                    atb = PIVOT_AXIS_COLUMN;
+                  }
+                else if (at == CTAT_COL || at == CTAT_LAYERCOL)
+                  {
+                    ata = PIVOT_AXIS_COLUMN;
+                    atb = PIVOT_AXIS_ROW;
+                  }
+
+                if (at == CTAT_LAYER
+                    ? a != PIVOT_AXIS_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER
+                    : at == CTAT_LAYERCOL || at == CTAT_LAYERROW
+                    ? a == atb && t->label_axis[a] != a
+                    : false)
                   {
                     for (size_t k = nest->n - 1; k < nest->n; k--)
-                      {
-                        if (k == nest->scale_idx)
-                          continue;
-                        nest->areas[at][nest->n_areas[at]++] = k;
-                        break;
-                      }
+                      if (k != nest->scale_idx)
+                        {
+                          nest->areas[at][nest->n_areas[at]++] = k;
+                          break;
+                        }
                     continue;
                   }
 
-                size_t n_drop = 0;
-                bool drop_inner = false;
+                if (at == CTAT_LAYER ? a != PIVOT_AXIS_LAYER
+                    : at == CTAT_LAYERROW || at == CTAT_LAYERCOL ? a == atb
+                    : at == CTAT_TABLE ? true
+                    : false)
+                  continue;
+
+                for (size_t k = 0; k < nest->n; k++)
+                  if (k != nest->scale_idx)
+                    nest->areas[at][nest->n_areas[at]++] = k;
+
+                int n_drop;
                 switch (at)
                   {
                   case CTAT_SUBTABLE:
-                    if (t->clabels_from_axis == PIVOT_AXIS_LAYER)
-                      n_drop = a != PIVOT_AXIS_LAYER;
-                    else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
-                      n_drop = a == t->clabels_from_axis ? 2 : 0;
-                    else
-                      {
-                        drop_inner = a == t->clabels_from_axis;
-                        n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
-                      }
+#define L PIVOT_AXIS_LAYER
+                    n_drop = (t->clabels_from_axis == L ? a != L
+                              : t->clabels_to_axis == L ? (t->clabels_from_axis == a ? -1 : a != L)
+                              : t->clabels_from_axis == a ? 2
+                              : 0);
+#undef L
                     break;
 
                   case CTAT_LAYERROW:
-                    n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
-                    break;
-
                   case CTAT_LAYERCOL:
-                    n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
+                    n_drop = a == ata && t->label_axis[ata] == atb;
                     break;
 
                   case CTAT_ROW:
-                    if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                      n_drop = 0;
-                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else
-                      {
-                        n_drop = a == PIVOT_AXIS_COLUMN;
-                        if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                          n_drop++;
-                      }
-                    break;
-
                   case CTAT_COL:
-                    if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                      n_drop = 0;
-                    else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else
-                      {
-                        n_drop = a == PIVOT_AXIS_ROW;
-                        if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                          n_drop++;
-                      }
+                    n_drop = (a == ata ? t->label_axis[ata] == atb
+                              : a != atb ? 0
+                              : t->clabels_from_axis == atb ? -1
+                              : t->clabels_to_axis != atb ? 1
+                              : 0);
                     break;
 
                   case CTAT_LAYER:
@@ -4763,7 +4741,7 @@ ctables_prepare_table (struct ctables_table *t)
                     break;
                   }
 
-                if (drop_inner)
+                if (n_drop < 0)
                   {
                     size_t n = nest->n_areas[at];
                     if (n > 1)
@@ -4772,9 +4750,12 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->n_areas[at]--;
                       }
                   }
-                for (size_t i = 0; i < n_drop; i++)
-                  if (nest->n_areas[at] > 0)
-                    nest->n_areas[at]--;
+                else
+                  {
+                    for (int i = 0; i < n_drop; i++)
+                      if (nest->n_areas[at] > 0)
+                        nest->n_areas[at]--;
+                  }
               }
           }
       }
@@ -5215,8 +5196,8 @@ ctables_section_uninit (struct ctables_section *s)
     }
 
   hmap_destroy (&s->cells);
-  for (size_t i = 0; i < N_CTATS; i++)
-    hmap_destroy (&s->areas[i]);
+  for (enum ctables_area_type at = 0; at < N_CTATS; at++)
+    hmap_destroy (&s->areas[at]);
 }
 
 static void