math: Coding style updates in some order-stat implementations.

[pspp] / src / math / trimmed-mean.c

diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c
index a687dd9b5fcffcd711ed983d0566edbb54847213..d44131a53b4c4eebf18efff5815f7723287f8348 100644 (file)
--- a/src/math/trimmed-mean.c
+++ b/src/math/trimmed-mean.c
@@ -33,10 +33,10 @@ acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, do
   struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent);
   struct order_stats *os = &tm->parent;
 
-  if ( cc > os->k[0].tc && cc <= os->k[1].tc)
+  if (cc > os->k[0].tc && cc <= os->k[1].tc)
     tm->sum += c * y;
 
-  if ( tm->cyk1p1 == SYSMIS && cc > os->k[0].tc)
+  if (tm->cyk1p1 == SYSMIS && cc > os->k[0].tc)
     tm->cyk1p1 = c * y;
 }
 
@@ -44,38 +44,34 @@ static void
 destroy (struct statistic *s)
 {
   struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent);
-  struct order_stats *os = &tm->parent;
-  free (os->k);
   free (tm);
 }
 
 struct trimmed_mean *
 trimmed_mean_create (double W, double tail)
 {
-  struct trimmed_mean *tm = xzalloc (sizeof (*tm));
-  struct order_stats *os = &tm->parent;
-  struct statistic *stat = &os->parent;
-
-  os->n_k = 2;
-  os->k = xcalloc (2, sizeof (*os->k));
-
   assert (tail >= 0);
   assert (tail <= 1);
 
-  os->k[0].tc = tail * W;
-  os->k[1].tc = W * (1 - tail);
-
-  stat->accumulate = acc;
-  stat->destroy = destroy;
-
-  tm->cyk1p1 = SYSMIS;
-  tm->w = W;
-  tm->tail = tail;
-
+  struct trimmed_mean *tm = xmalloc (sizeof *tm);
+  *tm = (struct trimmed_mean) {
+    .parent = {
+      .parent = {
+        .accumulate = acc,
+        .destroy = destroy,
+      },
+      .k = tm->k,
+      .n_k = 2,
+    },
+    .k[0] = { .tc = tail * W },
+    .k[1] = { .tc = W * (1 - tail) },
+    .cyk1p1 = SYSMIS,
+    .w = W,
+    .tail = tail,
+  };
   return tm;
 }
 
-
 double
 trimmed_mean_calculate (const struct trimmed_mean *tm)
 {
@@ -88,6 +84,6 @@ trimmed_mean_calculate (const struct trimmed_mean *tm)
       (tm->w - os->k[1].cc - os->k[0].tc) * os->k[1].y_p1
      +
       tm->sum
-     )
+)
     / ((1.0 - tm->tail * 2) * tm->w);
 }