X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Forder-stats.c;h=157bf2a165d1cd342027728ba5d020a73021413e;hb=refs%2Fbuilds%2F20131224033012%2Fpspp;hp=ca4160f4fdf6f52b09d82972edf10f6d8f4f6703;hpb=015e221b0f8578afee769528572c76387f26c629;p=pspp
diff --git a/src/math/order-stats.c b/src/math/order-stats.c
index ca4160f4fd..157bf2a165 100644
--- a/src/math/order-stats.c
+++ b/src/math/order-stats.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,14 +15,18 @@
along with this program. If not, see . */
#include
-#include "order-stats.h"
-#include
-#include
-#include
-#include
-#include
+
+#include "math/order-stats.h"
+
#include
+#include "data/casereader.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+
+#include "gl/xalloc.h"
+
#if 0
#include
@@ -90,7 +94,7 @@ update_k_values (const struct ccase *cx, double y_i, double c_i, double cc_i,
{
int k;
struct order_stats *tos = os[j];
- struct statistic *stat = (struct statistic *) tos;
+ struct statistic *stat = &tos->parent;
for (k = 0 ; k < tos->n_k; ++k)
{
struct k *myk = &tos->k[k];
@@ -107,53 +111,62 @@ update_k_values (const struct ccase *cx, double y_i, double c_i, double cc_i,
void
-order_stats_accumulate (struct order_stats **os, size_t nos,
- struct casereader *reader,
- const struct variable *wv,
- const struct variable *var,
- enum mv_class exclude)
+order_stats_accumulate_idx (struct order_stats **os, size_t nos,
+ struct casereader *reader,
+ int wt_idx,
+ int val_idx)
{
- struct ccase cx;
- struct ccase prev_cx;
+ struct ccase *cx;
+ struct ccase *prev_cx = NULL;
double prev_value = -DBL_MAX;
double cc_i = 0;
double c_i = 0;
- case_nullify (&prev_cx);
-
- for (; casereader_read (reader, &cx); case_destroy (&cx))
+ for (; (cx = casereader_read (reader)) != NULL; case_unref (cx))
{
- const double weight = wv ? case_data (&cx, wv)->f : 1.0;
- const double this_value = case_data (&cx, var)->f;
+ const double weight = (wt_idx == -1) ? 1.0 : case_data_idx (cx, wt_idx)->f;
+ const double this_value = case_data_idx (cx, val_idx)->f;
/* The casereader MUST be sorted */
assert (this_value >= prev_value);
- if ( var_is_value_missing (var, case_data (&cx, var), exclude))
- continue;
-
- case_destroy (&prev_cx);
-
if ( prev_value == -DBL_MAX || prev_value == this_value)
c_i += weight;
if ( prev_value > -DBL_MAX && this_value > prev_value)
{
- update_k_values (&prev_cx, prev_value, c_i, cc_i, os, nos);
+ update_k_values (prev_cx, prev_value, c_i, cc_i, os, nos);
c_i = weight;
}
+ case_unref (prev_cx);
cc_i += weight;
prev_value = this_value;
- case_clone (&prev_cx, &cx);
+ prev_cx = case_ref (cx);
}
- update_k_values (&prev_cx, prev_value, c_i, cc_i, os, nos);
- case_destroy (&prev_cx);
+ update_k_values (prev_cx, prev_value, c_i, cc_i, os, nos);
+ case_unref (prev_cx);
casereader_destroy (reader);
}
+void
+order_stats_accumulate (struct order_stats **os, size_t nos,
+ struct casereader *reader,
+ const struct variable *wv,
+ const struct variable *var,
+ enum mv_class exclude)
+{
+ /* Filter out missing cases */
+ reader = casereader_create_filter_missing (reader, &var, 1,
+ exclude, NULL, NULL);
+
+ order_stats_accumulate_idx (os, nos,
+ reader,
+ wv ? var_get_case_index (wv) : -1,
+ var_get_case_index (var));
+}