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);
+ msg (SE, _("%s for histogram must be greater than or equal to %s, "
+ "but %s was specified as %.15g and %s as %.15g. "
+ "%s and %s will be ignored."),
+ "MAX", "MIN",
+ "MIN", hist->x_min,
+ "MAX", hist->x_max,
+ "MIN", "MAX");
hist->x_min = hist->x_max = SYSMIS;
}
}
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);
+ msg (SE, _("%s for pie chart must be greater than or equal to %s, "
+ "but %s was specified as %.15g and %s as %.15g. "
+ "%s and %s will be ignored."),
+ "MAX", "MIN",
+ "MIN", pie->x_min,
+ "MAX", pie->x_max,
+ "MIN", "MAX");
pie->x_min = pie->x_max = SYSMIS;
}
}
histogram = freq_tab_to_hist (frq, &vf->tab, vf->var);
- chart_item_submit (histogram_chart_create (
+ if ( histogram)
+ {
+ chart_item_submit (histogram_chart_create (
histogram->gsl_hist, var_to_string(vf->var),
vf->tab.valid_cases,
d[FRQ_MEAN],
d[FRQ_STDDEV],
frq->hist->draw_normal));
- statistic_destroy (&histogram->parent);
+ statistic_destroy (&histogram->parent);
+ }
}
if (frq->pie)
{
if (vf->groups != NULL)
msg (SE, _("Variables %s specified multiple times on "
- "GROUPED subcommand."), var_get_name (v[i]));
+ "%s subcommand."), var_get_name (v[i]), "GROUPED");
else
{
vf->n_groups = nl;
goto found;
}
}
- msg (SE, _("Variables %s specified on GROUPED but not on "
- "VARIABLES."), var_get_name (v[i]));
+ msg (SE, _("Variables %s specified on %s but not on "
+ "%s."), var_get_name (v[i]), "GROUPED", "VARIABLES");
found:;
}
/* Freedman-Diaconis' choice of bin width. */
iqr = calculate_iqr (frq);
bin_width = 2 * iqr / pow (valid_freq, 1.0 / 3.0);
- bin_width = chart_rounded_tick (bin_width);
histogram = histogram_create (bin_width, x_min, x_max);
+
+ if ( histogram == NULL)
+ return NULL;
+
for (i = 0; i < ft->n_valid; i++)
{
const struct freq *f = &ft->valid[i];