X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fbox-whisker.c;h=e0fbbe94b2e1d61a103520f3c96789c0ba19519c;hb=c4f20f5e0aaf5489236188a9b138c47dfb23f36b;hp=4bbe0f58505d1c60ef407417f0eb53d5b31cdf90;hpb=8f7af0acaf8a9253242d89fcdb26e285841f7833;p=pspp

diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c
index 4bbe0f5850..e0fbbe94b2 100644
--- a/src/math/box-whisker.c
+++ b/src/math/box-whisker.c
@@ -85,7 +85,7 @@ acc (struct statistic *s, const struct ccase *cx,
 
   /* y is an outlier */
 
-  struct outlier *o = xzalloc (sizeof *o) ;
+  struct outlier *o = XZALLOC (struct outlier);
   o->value = y;
   o->extreme = extreme;
   ds_init_empty (&o->label);
@@ -144,26 +144,24 @@ struct box_whisker *
 box_whisker_create (const struct tukey_hinges *th,
 		    size_t id_idx, const struct variable *id_var)
 {
-  struct box_whisker *w = XZALLOC (struct box_whisker);
-  struct order_stats *os = &w->parent;
-  struct statistic *stat = &os->parent;
-
-  os->n_k = 0;
-
-  stat->destroy = destroy;
-  stat->accumulate = acc;
-
-  tukey_hinges_calculate (th, w->hinges);
-
-  w->id_idx = id_idx;
-  w->id_var = id_var;
-
-  w->step = (w->hinges[2] - w->hinges[0]) * 1.5;
-
-  w->whiskers[1] = w->hinges[2];
-  w->whiskers[0] = SYSMIS;
-
-  ll_init (&w->outliers);
+  double hinges[3];
+  tukey_hinges_calculate (th, hinges);
+
+  struct box_whisker *w = xmalloc (sizeof *w);
+  *w = (struct box_whisker) {
+    .parent = {
+      .parent = {
+        .destroy = destroy,
+      },
+      .accumulate = acc,
+    },
+    .hinges = { hinges[0], hinges[1], hinges[2] },
+    .whiskers = { SYSMIS, hinges[2] },
+    .outliers = LL_INITIALIZER (w->outliers),
+    .step = (hinges[2] - hinges[0]) * 1.5,
+    .id_idx = id_idx,
+    .id_var = id_var,
+  };
 
   return w;
 }