/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 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 <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
-#include <output/output.h>
-#include <output/table.h>
+#include <output/tab.h>
#include "minmax.h"
#include "xalloc.h"
The rest of the data was allocated and destroyed at a
lower level already. */
- free (pt);
}
+ free (proc->pivots);
}
static int internal_cmd_crosstabs (struct lexer *lexer, struct dataset *ds,
static void tabulate_integer_case (struct pivot_table *, const struct ccase *,
double weight);
static void postcalc (struct crosstabs_proc *);
-static void submit (struct crosstabs_proc *, struct pivot_table *,
- struct tab_table *);
+static void submit (struct pivot_table *, struct tab_table *);
/* Parse and execute CROSSTABS, then clean up. */
int
case_unref (c);
}
+ /* Initialize hash tables. */
+ for (pt = &proc->pivots[0]; pt < &proc->pivots[proc->n_pivots]; pt++)
+ hmap_init (&pt->data);
+
/* Tabulate. */
for (; (c = casereader_read (group)) != NULL; case_unref (c))
for (pt = &proc->pivots[0]; pt < &proc->pivots[proc->n_pivots]; pt++)
pt->n_consts = 0;
pt->const_vars = NULL;
pt->const_values = NULL;
- hmap_init (&pt->data);
- pt->entries = NULL;
- pt->n_entries = 0;
for (j = 0; j < n_by; j++)
pt->vars[j] = by[j][by_iter[j]];
struct string name;
int i;
- summary = tab_create (7, 3 + proc->n_pivots, 1);
+ summary = tab_create (7, 3 + proc->n_pivots);
tab_title (summary, _("Summary."));
tab_headers (summary, 1, 0, 3, 0);
tab_joint_text (summary, 1, 0, 6, 0, TAB_CENTER, _("Cases"));
}
ds_destroy (&name);
- submit (proc, NULL, summary);
+ submit (NULL, summary);
}
\f
/* Output. */
static void display_risk (struct pivot_table *, struct tab_table *);
static void display_directional (struct crosstabs_proc *, struct pivot_table *,
struct tab_table *);
-static void crosstabs_dim (struct tab_table *, struct outp_driver *,
- void *proc);
static void table_value_missing (struct crosstabs_proc *proc,
struct tab_table *table, int c, int r,
unsigned char opt, const union value *v,
free (x.col_tot);
}
- submit (proc, NULL, table);
+ submit (NULL, table);
if (chisq)
{
if (!showed_fisher)
tab_resize (chisq, 4 + (pt->n_vars - 2), -1);
- submit (proc, pt, chisq);
+ submit (pt, chisq);
}
- submit (proc, pt, sym);
- submit (proc, pt, risk);
- submit (proc, pt, direct);
+ submit (pt, sym);
+ submit (pt, risk);
+ submit (pt, direct);
free (pt->cols);
}
int i;
table = tab_create (pt->n_consts + 1 + pt->n_cols + 1,
- (pt->n_entries / pt->n_cols) * 3 / 2 * proc->n_cells + 10,
- true);
+ (pt->n_entries / pt->n_cols) * 3 / 2 * proc->n_cells + 10);
tab_headers (table, pt->n_consts + 1, 0, 2, 0);
/* First header line. */
struct tab_table *chisq;
chisq = tab_create (6 + (pt->n_vars - 2),
- pt->n_entries / pt->n_cols * 3 / 2 * N_CHISQ + 10,
- 1);
+ pt->n_entries / pt->n_cols * 3 / 2 * N_CHISQ + 10);
tab_headers (chisq, 1 + (pt->n_vars - 2), 0, 1, 0);
tab_title (chisq, _("Chi-square tests."));
struct tab_table *sym;
sym = tab_create (6 + (pt->n_vars - 2),
- pt->n_entries / pt->n_cols * 7 + 10, 1);
+ pt->n_entries / pt->n_cols * 7 + 10);
tab_headers (sym, 2 + (pt->n_vars - 2), 0, 1, 0);
tab_title (sym, _("Symmetric measures."));
{
struct tab_table *risk;
- risk = tab_create (4 + (pt->n_vars - 2), pt->n_entries / pt->n_cols * 4 + 10,
- 1);
+ risk = tab_create (4 + (pt->n_vars - 2), pt->n_entries / pt->n_cols * 4 + 10);
tab_headers (risk, 1 + pt->n_vars - 2, 0, 2, 0);
tab_title (risk, _("Risk estimate."));
struct tab_table *direct;
direct = tab_create (7 + (pt->n_vars - 2),
- pt->n_entries / pt->n_cols * 7 + 10, 1);
+ pt->n_entries / pt->n_cols * 7 + 10);
tab_headers (direct, 3 + (pt->n_vars - 2), 0, 1, 0);
tab_title (direct, _("Directional measures."));
/* Prepare table T for submission, and submit it. */
static void
-submit (struct crosstabs_proc *proc, struct pivot_table *pt,
- struct tab_table *t)
+submit (struct pivot_table *pt, struct tab_table *t)
{
int i;
tab_resize (t, -1, 0);
if (tab_nr (t) == tab_t (t))
{
- tab_destroy (t);
+ table_unref (&t->table);
return;
}
tab_offset (t, 0, 0);
tab_box (t, -1, -1, -1, TAL_GAP, 0, tab_t (t), tab_l (t) - 1,
tab_nr (t) - 1);
tab_vline (t, TAL_2, tab_l (t), 0, tab_nr (t) - 1);
- tab_dim (t, crosstabs_dim, proc);
- tab_submit (t);
-}
-
-/* Sets the widths of all the columns and heights of all the rows in
- table T for driver D. */
-static void
-crosstabs_dim (struct tab_table *t, struct outp_driver *d, void *proc_)
-{
- struct crosstabs_proc *proc = proc_;
- int i;
-
- /* Width of a numerical column. */
- int c = outp_string_width (d, "0.000000", OUTP_PROPORTIONAL);
- if (proc->exclude == MV_NEVER)
- c += outp_string_width (d, "M", OUTP_PROPORTIONAL);
-
- /* Set width for header columns. */
- if (t->l != 0)
- {
- size_t i;
- int w;
-
- w = d->width - c * (t->nc - t->l);
- for (i = 0; i <= t->nc; i++)
- w -= t->wrv[i];
- w /= t->l;
-
- if (w < d->prop_em_width * 8)
- w = d->prop_em_width * 8;
-
- if (w > d->prop_em_width * 15)
- w = d->prop_em_width * 15;
- for (i = 0; i < t->l; i++)
- t->w[i] = w;
- }
-
- for (i = t->l; i < t->nc; i++)
- t->w[i] = c;
-
- for (i = 0; i < t->nr; i++)
- t->h[i] = tab_natural_height (t, d, i);
+ tab_submit (t);
}
static bool
struct tab_table *table, int c, int r, unsigned char opt,
const union value *v, const struct variable *var)
{
- struct substring s;
- const struct fmt_spec *print = var_get_print_format (var);
-
const char *label = var_lookup_value_label (var, v);
- if (label)
- {
- tab_text (table, c, r, TAB_LEFT, label);
- return;
- }
-
- s = ss_cstr (data_out_pool (v, dict_get_encoding (proc->dict), print,
- table->container));
- if (proc->exclude == MV_NEVER && var_is_num_missing (var, v->f, MV_USER))
- s.string[s.length++] = 'M';
- while (s.length && *s.string == ' ')
+ if (label != NULL)
+ tab_text (table, c, r, TAB_LEFT, label);
+ else
{
- s.length--;
- s.string++;
+ const struct fmt_spec *print = var_get_print_format (var);
+ if (proc->exclude == MV_NEVER && var_is_value_missing (var, v, MV_USER))
+ {
+ char *s = data_out (v, dict_get_encoding (proc->dict), print);
+ tab_text_format (table, c, r, opt, "%sM", s + strspn (s, " "));
+ free (s);
+ }
+ else
+ tab_value (table, c, r, opt, v, proc->dict, print);
}
- tab_raw (table, c, r, opt, &s);
}
/* Draws a line across TABLE at the current row to indicate the most
{
const struct fmt_spec f = {FMT_F, 10, 1};
union value v;
- struct substring s;
+ char suffixes[3];
+ int suffix_len;
+ char *s;
v.f = value;
- s = ss_cstr (data_out_pool (&v, dict_get_encoding (dict), &f, table->container));
+ s = data_out (&v, dict_get_encoding (dict), &f);
- while (*s.string == ' ')
- {
- s.length--;
- s.string++;
- }
+ suffix_len = 0;
if (suffix != 0)
- s.string[s.length++] = suffix;
+ suffixes[suffix_len++] = suffix;
if (mark_missing)
- s.string[s.length++] = 'M';
+ suffixes[suffix_len++] = 'M';
+ suffixes[suffix_len] = '\0';
- tab_raw (table, c, r, TAB_RIGHT, &s);
+ tab_text_format (table, c, r, TAB_RIGHT, "%s%s",
+ s + strspn (s, " "), suffixes);
}
/* Displays the crosstabulation table. */
projects / pspp / blobdiff