/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010, 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
#include <config.h>
-#include <data/format.h>
-#include <output/table.h>
-#include <data/casereader.h>
-#include <libpspp/hash.h>
-#include <data/variable.h>
-#include "npar-summary.h"
-#include <math/moments.h>
-#include <data/case.h>
-#include <data/dictionary.h>
+#include "language/stats/npar-summary.h"
+
#include <math.h>
-#include <minmax.h>
+
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/variable.h"
+#include "math/moments.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
struct casereader *input,
const struct dictionary *dict,
const struct variable *const *vv,
- int n_vars UNUSED,
+ int n_vars,
enum mv_class filter)
{
int i = 0;
- while (*vv)
+ for (i = 0 ; i < n_vars; ++i)
{
double minimum = DBL_MAX;
double maximum = -DBL_MAX;
double var;
struct moments1 *moments = moments1_create (MOMENT_VARIANCE);
struct ccase *c;
- const struct variable *v = *vv++;
+ const struct variable *v = vv[i];
struct casereader *pass;
pass = casereader_clone (input);
desc[i].min = minimum;
desc[i].max = maximum;
-
- i++;
}
+
casereader_destroy (input);
}
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, NULL);
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, RC_OTHER);
+ tab_double (table, col++, 2 + v, 0, desc[v].mean, fmt, RC_OTHER);
+ tab_double (table, col++, 2 + v, 0, desc[v].std_dev, fmt, RC_OTHER);
+ tab_double (table, col++, 2 + v, 0, desc[v].min, fmt, RC_OTHER);
+ tab_double (table, col++, 2 + v, 0, desc[v].max, fmt, RC_OTHER);
+ }
}