Categoricals: Sort the reverse value map.

[pspp] / src / math / np.c

diff --git a/src/math/np.c b/src/math/np.c
index 99584a5105b75879517e4b30982e9d78280a5dd1..b631820903e6ebf4e41a536ebe7ea964924af918 100644 (file)
--- a/src/math/np.c
+++ b/src/math/np.c
@@ -16,20 +16,25 @@
 
 #include <config.h>
 #include "np.h"
-#include <math/moments.h>
-#include <gl/xalloc.h>
-#include <stdlib.h>
-#include <math.h>
+
 #include <gsl/gsl_cdf.h>
-#include <libpspp/compiler.h>
+#include <math.h>
+#include <stdlib.h>
+
 #include <data/case.h>
 #include <data/casewriter.h>
+#include <libpspp/compiler.h>
+#include <libpspp/cast.h>
+#include <libpspp/misc.h>
+#include <math/moments.h>
+
+#include "xalloc.h"
 
 static void
 destroy (struct statistic *stat)
 {
-  struct order_stats *os = (struct order_stats *) stat;
-  free (os);
+  struct np *np = UP_CAST (stat, struct np, parent.parent);
+  free (np);
 }
 
 
@@ -38,7 +43,7 @@ acc (struct statistic *s, const struct ccase *cx UNUSED,
      double c, double cc, double y)
 {
   struct ccase *cp;
-  struct np *np = (struct np *) s;
+  struct np *np = UP_CAST (s, struct np, parent.parent);
   double rank = np->prev_cc + (c + 1) / 2.0;
 
   double ns = gsl_cdf_ugaussian_Pinv (rank / ( np->n + 1 ));
@@ -56,7 +61,7 @@ acc (struct statistic *s, const struct ccase *cx UNUSED,
   maximize (&np->y_max, y);
   minimize (&np->y_min, y);
 
-  cp = case_create (n_NP_IDX);
+  cp = case_create (casewriter_get_proto (np->writer));
   case_data_rw_idx (cp, NP_IDX_Y)->f = y;
   case_data_rw_idx (cp, NP_IDX_NS)->f = ns;
   case_data_rw_idx (cp, NP_IDX_DNS)->f = dns;
@@ -65,13 +70,15 @@ acc (struct statistic *s, const struct ccase *cx UNUSED,
   np->prev_cc = cc;
 }
 
-struct order_stats *
+struct np *
 np_create (const struct moments1 *m)
 {
   double variance;
   struct np *np = xzalloc (sizeof (*np));
-  struct statistic *stat = (struct statistic *) np;
-  struct order_stats *os = (struct order_stats *) np;
+  struct order_stats *os = &np->parent;
+  struct statistic *stat = &os->parent;
+  struct caseproto *proto;
+  int i;
 
   np->prev_cc = 0;
 
@@ -82,11 +89,15 @@ np_create (const struct moments1 *m)
   np->y_min = np->ns_min = np->dns_min = DBL_MAX;
   np->y_max = np->ns_max = np->dns_max = -DBL_MAX;
 
-  np->writer = autopaging_writer_create (n_NP_IDX);
+  proto = caseproto_create ();
+  for (i = 0; i < n_NP_IDX; i++)
+    proto = caseproto_add_width (proto, 0);
+  np->writer = autopaging_writer_create (proto);
+  caseproto_unref (proto);
 
   os->k = 0;
   stat->destroy = destroy;
   stat->accumulate = acc;
 
-  return os;
+  return np;
 }