/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010 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
#include <config.h>
#include <data/format.h>
-#include <output/table.h>
+#include <output/tab.h>
#include <data/casereader.h>
-#include <libpspp/hash.h>
#include <data/variable.h>
#include "npar-summary.h"
#include <math/moments.h>
double maximum = -DBL_MAX;
double var;
struct moments1 *moments = moments1_create (MOMENT_VARIANCE);
- struct ccase c;
+ struct ccase *c;
const struct variable *v = *vv++;
struct casereader *pass;
pass = casereader_clone (input);
pass = casereader_create_filter_missing (pass,
&v, 1,
- filter, NULL);
+ filter, NULL, NULL);
pass = casereader_create_filter_weight (pass, dict, NULL, NULL);
- while (casereader_read(pass, &c))
+ while ((c = casereader_read (pass)) != NULL)
{
- double val = case_num (&c, v);
- double w = dict_get_case_weight (dict, &c, NULL);
+ double val = case_num (c, v);
+ double w = dict_get_case_weight (dict, c, NULL);
minimum = MIN (minimum, val);
maximum = MAX (maximum, val);
moments1_add (moments, val, w);
- case_destroy (&c);
+ case_unref (c);
}
casereader_destroy (pass);
}
-void
-do_summary_box (const struct descriptives *desc,
- const struct variable *const *vv,
- int n_vars);
-
void
do_summary_box (const struct descriptives *desc,
if ( desc ) columns += 5;
if ( quartiles ) columns += 3;
- table = tab_create (columns, 2 + n_vars, 0);
+ table = tab_create (columns, 2 + n_vars);
- tab_dim (table, tab_natural_dimensions);
tab_title (table, _("Descriptive Statistics"));
tab_headers (table, 1, 0, 1, 0);
tab_box (table, TAL_1, TAL_1, -1, TAL_1,
- 0, 0, table->nc - 1, tab_nr(table) - 1 );
+ 0, 0, tab_nc (table) - 1, tab_nr(table) - 1 );
tab_hline (table, TAL_2, 0, tab_nc (table) -1, 2);
tab_vline (table, TAL_2, 1, 0, tab_nr (table) - 1);
const struct variable *var = vv[v];
const struct fmt_spec *fmt = var_get_print_format (var);
- tab_text (table, 0, 2 + v, TAT_NONE, var_to_string (var));
-
- tab_double (table, 1, 2 + v, TAT_NONE, desc[v].n, fmt);
- tab_double (table, 2, 2 + v, TAT_NONE, desc[v].mean, fmt);
- tab_double (table, 3, 2 + v, TAT_NONE, desc[v].std_dev, fmt);
- tab_double (table, 4, 2 + v, TAT_NONE, desc[v].min, fmt);
- tab_double (table, 5, 2 + v, TAT_NONE, desc[v].max, fmt);
+ tab_text (table, 0, 2 + v, 0, var_to_string (var));
+
+ col = 1;
+ if (desc != NULL)
+ {
+ tab_double (table, col++, 2 + v, 0, desc[v].n, fmt);
+ tab_double (table, col++, 2 + v, 0, desc[v].mean, fmt);
+ tab_double (table, col++, 2 + v, 0, desc[v].std_dev, fmt);
+ tab_double (table, col++, 2 + v, 0, desc[v].min, fmt);
+ tab_double (table, col++, 2 + v, 0, desc[v].max, fmt);
+ }
}