X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Fbox-whisker.c;h=fb5c2c62a21fefe6842f820ef6599c4e05bbf3c7;hb=f1cb9492fb8af446458607158c9cd01ad85a6768;hp=288fc072ef119ccb2c49b2001a015a34834378ad;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp

diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c
index 288fc072ef..fb5c2c62a2 100644
--- a/src/math/box-whisker.c
+++ b/src/math/box-whisker.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,23 +15,28 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
 #include "box-whisker.h"
-#include "order-stats.h"
-#include "tukey-hinges.h"
-#include <gl/xalloc.h>
-#include <libpspp/assertion.h>
+
 #include <math.h>
 #include <float.h>
-#include <data/val-type.h>
-#include <libpspp/str.h>
-#include <data/case.h>
-#include <data/variable.h>
+
+#include "data/case.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/str.h"
+#include "math/order-stats.h"
+#include "math/tukey-hinges.h"
+
+#include "gl/xalloc.h"
 
 static void
 destroy (struct statistic *s)
 {
-  struct order_stats *os = (struct order_stats *) s;
-  struct box_whisker *bw = (struct box_whisker *) s;
+  struct box_whisker *bw = UP_CAST (s, struct box_whisker, parent.parent);
+  struct order_stats *os = &bw->parent;
   struct ll *ll;
 
   for (ll = ll_head (&bw->outliers); ll != ll_null (&bw->outliers); )
@@ -53,7 +58,7 @@ static void
 acc (struct statistic *s, const struct ccase *cx,
      double c UNUSED, double cc UNUSED, double y)
 {
-  struct box_whisker *bw = (struct box_whisker *) s;
+  struct box_whisker *bw = UP_CAST (s, struct box_whisker, parent.parent);
   bool extreme;
   struct outlier *o;
 
@@ -77,14 +82,9 @@ acc (struct statistic *s, const struct ccase *cx,
   o->extreme = extreme;
   ds_init_empty (&o->label);
 
-  if (bw->id_var)
-    var_append_value_name (bw->id_var,
-			   case_data (cx, bw->id_var),
-			   &o->label);
-  else
-    ds_put_format (&o->label,
+  ds_put_format (&o->label,
 		   "%ld",
-		   (casenumber) case_data_idx (cx, bw->casenumber_idx)->f);
+                 (casenumber) case_data_idx (cx, bw->casenumber_idx)->f);
 
   ll_push_head (&bw->outliers, &o->ll);
 }
@@ -110,13 +110,21 @@ box_whisker_outliers (const struct box_whisker *bw)
   return &bw->outliers;
 }
 
-struct statistic *
+/*
+  Create a box_whisker struct, suitable for generating a boxplot.
+
+  TH are the tukey hinges of the dataset.
+
+  Casenumber_idx is the index into the casereader which will be used to label 
+  outliers.
+*/
+struct box_whisker *
 box_whisker_create (const struct tukey_hinges *th,
-		    const struct variable *id_var,  size_t casenumber_idx)
+		    size_t casenumber_idx)
 {
   struct box_whisker *w = xzalloc (sizeof (*w));
-  struct order_stats *os = (struct order_stats *) w;
-  struct statistic *stat = (struct statistic *) w;
+  struct order_stats *os = &w->parent;
+  struct statistic *stat = &os->parent;
 
   os->n_k = 0;
 
@@ -126,7 +134,6 @@ box_whisker_create (const struct tukey_hinges *th,
   tukey_hinges_calculate (th, w->hinges);
 
   w->casenumber_idx = casenumber_idx;
-  w->id_var = id_var;
 
   w->step = (w->hinges[2] - w->hinges[0]) * 1.5;
 
@@ -135,5 +142,5 @@ box_whisker_create (const struct tukey_hinges *th,
 
   ll_init (&w->outliers);
 
-  return stat;
+  return w;
 }