| BI(FRQ_SKEW) | BI(FRQ_SESKEW) | BI(FRQ_RANGE) \
| BI(FRQ_RANGE) | BI(FRQ_MODE) | BI(FRQ_MEDIAN))
-/* Statistics; number of statistics. */
-static unsigned long stats;
-static int n_stats;
-
struct frq_chart
{
double x_min; /* X axis minimum value. */
bool include_missing; /* Whether to include missing values. */
};
-/* Histogram and pie chart settings. */
-static struct frq_chart hist, pie;
-
/* Parsed command. */
static struct cmd_frequencies cmd;
struct percentile *percentiles;
int n_percentiles, n_show_percentiles;
+
+ /* Statistics; number of statistics. */
+ unsigned long stats;
+ int n_stats;
+
+ /* Histogram and pie chart settings. */
+ struct frq_chart *hist, *pie;
};
-static void determine_charts (void);
+static void determine_charts (struct frq_proc *frq);
static void calc_stats (const struct frq_proc *, const struct var_freqs *,
double d[FRQ_N_STATS]);
static void add_percentile (struct frq_proc *, double x, bool show,
size_t *allocated_percentiles);
-static void do_piechart(const struct variable *var,
- const struct freq_tab *frq_tab);
+static void do_piechart(const struct frq_chart *, const struct variable *,
+ const struct freq_tab *);
struct histogram *freq_tab_to_hist(const struct frq_proc *,
const struct freq_tab *,
frq.n_percentiles = 0;
frq.n_show_percentiles = 0;
+ frq.hist = NULL;
+ frq.pie = NULL;
+
allocated_percentiles = 0;
if (!parse_frequencies (lexer, ds, &cmd, &frq))
}
/* Figure out statistics to calculate. */
- stats = 0;
+ frq.stats = 0;
if (cmd.a_statistics[FRQ_ST_DEFAULT] || !cmd.sbc_statistics)
- stats |= FRQ_DEFAULT;
+ frq.stats |= FRQ_DEFAULT;
if (cmd.a_statistics[FRQ_ST_ALL])
- stats |= FRQ_ALL;
+ frq.stats |= FRQ_ALL;
if (cmd.sort != FRQ_AVALUE && cmd.sort != FRQ_DVALUE)
- stats &= ~BIT_INDEX (FRQ_MEDIAN);
+ frq.stats &= ~BIT_INDEX (FRQ_MEDIAN);
for (i = 0; i < FRQ_N_STATS; i++)
if (cmd.a_statistics[st_name[i].st_indx])
- stats |= BIT_INDEX (i);
- if (stats & FRQ_KURT)
- stats |= BIT_INDEX (FRQ_SEKURT);
- if (stats & FRQ_SKEW)
- stats |= BIT_INDEX (FRQ_SESKEW);
+ frq.stats |= BIT_INDEX (i);
+ if (frq.stats & FRQ_KURT)
+ frq.stats |= BIT_INDEX (FRQ_SEKURT);
+ if (frq.stats & FRQ_SKEW)
+ frq.stats |= BIT_INDEX (FRQ_SESKEW);
/* Calculate n_stats. */
- n_stats = 0;
+ frq.n_stats = 0;
for (i = 0; i < FRQ_N_STATS; i++)
- if ((stats & BIT_INDEX (i)))
- n_stats++;
+ if ((frq.stats & BIT_INDEX (i)))
+ frq.n_stats++;
/* Charting. */
- determine_charts ();
+ determine_charts (&frq);
if (cmd.sbc_histogram || cmd.sbc_piechart || cmd.sbc_ntiles)
cmd.sort = FRQ_AVALUE;
&allocated_percentiles);
}
}
- if (stats & BIT_INDEX (FRQ_MEDIAN))
+ if (frq.stats & BIT_INDEX (FRQ_MEDIAN))
{
/* Treat the median as the 50% percentile.
We output it in the percentiles table as "50 (Median)." */
add_percentile (&frq, 0.5, true, &allocated_percentiles);
- stats &= ~BIT_INDEX (FRQ_MEDIAN);
- n_stats--;
+ frq.stats &= ~BIT_INDEX (FRQ_MEDIAN);
+ frq.n_stats--;
}
if (cmd.sbc_histogram)
{
pool_destroy (frq.pool);
free (frq.vars);
free (frq.percentiles);
+ free (frq.hist);
+ free (frq.pie);
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
}
/* Figure out which charts the user requested. */
static void
-determine_charts (void)
+determine_charts (struct frq_proc *frq)
{
if (cmd.sbc_barchart)
msg (SW, _("Bar charts are not implemented."));
if (cmd.sbc_histogram)
{
- hist.x_min = cmd.hi_min;
- hist.x_max = cmd.hi_max;
- hist.y_scale = cmd.hi_scale;
- hist.y_max = cmd.hi_scale == FRQ_FREQ ? cmd.hi_freq : cmd.hi_pcnt;
- hist.draw_normal = cmd.hi_norm != FRQ_NONORMAL;
- hist.include_missing = false;
-
- if (hist.x_min != SYSMIS && hist.x_max != SYSMIS
- && hist.x_min >= hist.x_max)
+ struct frq_chart *hist;
+
+ hist = frq->hist = xmalloc (sizeof *frq->hist);
+ hist->x_min = cmd.hi_min;
+ hist->x_max = cmd.hi_max;
+ hist->y_scale = cmd.hi_scale;
+ hist->y_max = cmd.hi_scale == FRQ_FREQ ? cmd.hi_freq : cmd.hi_pcnt;
+ hist->draw_normal = cmd.hi_norm != FRQ_NONORMAL;
+ hist->include_missing = false;
+
+ if (hist->x_min != SYSMIS && hist->x_max != SYSMIS
+ && hist->x_min >= hist->x_max)
{
msg (SE, _("MAX for histogram must be greater than or equal to MIN, "
"but MIN was specified as %.15g and MAX as %.15g. "
- "MIN and MAX will be ignored."), hist.x_min, hist.x_max);
- hist.x_min = hist.x_max = SYSMIS;
+ "MIN and MAX will be ignored."),
+ hist->x_min, hist->x_max);
+ hist->x_min = hist->x_max = SYSMIS;
}
}
if (cmd.sbc_piechart)
{
- pie.x_min = cmd.pie_min;
- pie.x_max = cmd.pie_max;
- pie.y_scale = cmd.pie_scale;
- pie.include_missing = cmd.pie_missing == FRQ_MISSING;
+ struct frq_chart *pie;
+
+ pie = frq->pie = xmalloc (sizeof *frq->pie);
+ pie->x_min = cmd.pie_min;
+ pie->x_max = cmd.pie_max;
+ pie->y_scale = cmd.pie_scale;
+ pie->include_missing = cmd.pie_missing == FRQ_MISSING;
- if (pie.x_min != SYSMIS && pie.x_max != SYSMIS
- && pie.x_min >= pie.x_max)
+ if (pie->x_min != SYSMIS && pie->x_max != SYSMIS
+ && pie->x_min >= pie->x_max)
{
msg (SE, _("MAX for pie chart must be greater than or equal to MIN, "
"but MIN was specified as %.15g and MAX as %.15g. "
- "MIN and MAX will be ignored."), pie.x_min, pie.x_max);
- pie.x_min = pie.x_max = SYSMIS;
+ "MIN and MAX will be ignored."), pie->x_min, pie->x_max);
+ pie->x_min = pie->x_max = SYSMIS;
}
}
-
}
/* Add data from case C to the frequency table. */
dump_freq_table (vf, wv);
/* Statistics. */
- if (n_stats)
+ if (frq->n_stats)
dump_statistics (frq, vf, wv);
- if (cmd.sbc_histogram && var_is_numeric (vf->var) && vf->tab.n_valid > 0)
+ if (frq->hist && var_is_numeric (vf->var) && vf->tab.n_valid > 0)
{
double d[FRQ_N_STATS];
struct histogram *histogram;
vf->tab.valid_cases,
d[FRQ_MEAN],
d[FRQ_STDDEV],
- hist.draw_normal));
+ frq->hist->draw_normal));
statistic_destroy (&histogram->parent);
}
- if (cmd.sbc_piechart)
- do_piechart(vf->var, &vf->tab);
+ if (frq->pie)
+ do_piechart(frq->pie, vf->var, &vf->tab);
cleanup_freq_tab (vf);
}
calc_stats (frq, vf, stat_value);
- t = tab_create (3, n_stats + frq->n_show_percentiles + 2);
+ t = tab_create (3, frq->n_stats + frq->n_show_percentiles + 2);
tab_box (t, TAL_1, TAL_1, -1, -1 , 0 , 0 , 2, tab_nr(t) - 1) ;
r=2; /* N missing and N valid are always dumped */
for (i = 0; i < FRQ_N_STATS; i++)
- if (stats & BIT_INDEX (i))
+ if (frq->stats & BIT_INDEX (i))
{
tab_text (t, 0, r, TAB_LEFT | TAT_TITLE,
gettext (st_name[i].s10));
valid_freq = 0;
for (i = 0; i < ft->n_valid; i++)
{
- const struct freq *frq = &ft->valid[i];
- if (chart_includes_value (&hist, var, &frq->value))
+ const struct freq *f = &ft->valid[i];
+ if (chart_includes_value (frq->hist, var, &f->value))
{
- x_min = MIN (x_min, frq->value.f);
- x_max = MAX (x_max, frq->value.f);
- valid_freq += frq->count;
+ x_min = MIN (x_min, f->value.f);
+ x_max = MAX (x_max, f->value.f);
+ valid_freq += f->count;
}
}
histogram = histogram_create (bins, x_min, x_max);
for (i = 0; i < ft->n_valid; i++)
{
- const struct freq *frq = &ft->valid[i];
- if (chart_includes_value (&hist, var, &frq->value))
- histogram_add (histogram, frq->value.f, frq->count);
+ const struct freq *f = &ft->valid[i];
+ if (chart_includes_value (frq->hist, var, &f->value))
+ histogram_add (histogram, f->value.f, f->count);
}
return histogram;
}
static int
-add_slice (const struct freq *freq, const struct variable *var,
- struct slice *slice)
+add_slice (const struct frq_chart *pie, const struct freq *freq,
+ const struct variable *var, struct slice *slice)
{
- if (chart_includes_value (&pie, var, &freq->value))
+ if (chart_includes_value (pie, var, &freq->value))
{
ds_init_empty (&slice->label);
var_append_value_name (var, &freq->value, &slice->label);
The caller is responsible for freeing slices
*/
static struct slice *
-freq_tab_to_slice_array(const struct freq_tab *frq_tab,
+freq_tab_to_slice_array(const struct frq_chart *pie,
+ const struct freq_tab *frq_tab,
const struct variable *var,
int *n_slicesp)
{
n_slices = 0;
for (i = 0; i < frq_tab->n_valid; i++)
- n_slices += add_slice (&frq_tab->valid[i], var, &slices[n_slices]);
+ n_slices += add_slice (pie, &frq_tab->valid[i], var, &slices[n_slices]);
for (i = 0; i < frq_tab->n_missing; i++)
- n_slices += add_slice (&frq_tab->missing[i], var, &slices[n_slices]);
+ n_slices += add_slice (pie, &frq_tab->missing[i], var, &slices[n_slices]);
*n_slicesp = n_slices;
return slices;
static void
-do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
+do_piechart(const struct frq_chart *pie, const struct variable *var,
+ const struct freq_tab *frq_tab)
{
struct slice *slices;
int n_slices, i;
- slices = freq_tab_to_slice_array (frq_tab, var, &n_slices);
+ slices = freq_tab_to_slice_array (pie, frq_tab, var, &n_slices);
if (n_slices < 2)
msg (SW, _("Omitting pie chart for %s, which has only %d unique values."),
projects / pspp / blobdiff