X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.q;h=e52aaf0f9ae3f50d7b40880050e18b6d06170c34;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=83b864c9f695c4494c5b5f2204b9d4ecd0054c46;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp-builds.git diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index 83b864c9..e52aaf0f 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -48,12 +48,10 @@ #include #include #include -#include +#include #include #include -#include -#include -#include +#include #include "freq.h" @@ -612,13 +610,14 @@ postcalc (const struct dataset *ds) hist = freq_tab_to_hist (ft,v); - histogram_plot_n (hist, var_to_string(v), - vf->tab.valid_cases, - d[frq_mean], - d[frq_stddev], - normal); + chart_item_submit (histogram_chart_create ( + hist->gsl_hist, var_to_string(v), + vf->tab.valid_cases, + d[frq_mean], + d[frq_stddev], + normal)); - statistic_destroy ((struct statistic *)hist); + statistic_destroy (&hist->parent); } if ( chart == GFT_PIE) @@ -1000,28 +999,6 @@ compare_freq_alpha_d (const void *a_, const void *b_, const void *v_) /* Frequency table display. */ -/* Sets the widths of all the columns and heights of all the rows in - table T for driver D. */ -static void -full_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED) -{ - int i = 0; - int columns = 5; - - if (cmd.labels == FRQ_LABELS) - { - t->w[0] = MIN (tab_natural_width (t, d, 0), d->prop_em_width * 15); - i = 1; - columns ++; - } - - for (;i < columns; i++) - t->w[i] = MAX (tab_natural_width (t, d, i), d->prop_em_width * 8); - - for (i = 0; i < t->nr; i++) - t->h[i] = d->font_height; -} - /* Displays a full frequency table for variable V. */ static void dump_full (const struct variable *v, const struct variable *wv) @@ -1032,32 +1009,16 @@ dump_full (const struct variable *v, const struct variable *wv) struct freq_tab *ft; struct freq_mutable *f; struct tab_table *t; - int r; + int r, x; double cum_total = 0.0; double cum_freq = 0.0; - struct init - { - int c, r; - const char *s; - }; - - const struct init *p; - - static const struct init vec[] = - { - {4, 0, N_("Valid")}, - {5, 0, N_("Cum")}, - {1, 1, N_("Value")}, - {2, 1, N_("Frequency")}, - {3, 1, N_("Percent")}, - {4, 1, N_("Percent")}, - {5, 1, N_("Percent")}, - {0, 0, NULL}, - {1, 0, NULL}, - {2, 0, NULL}, - {3, 0, NULL}, - {-1, -1, NULL}, + static const char *headings[] = { + N_("Value"), + N_("Frequency"), + N_("Percent"), + N_("Valid Percent"), + N_("Cum Percent") }; const bool lab = (cmd.labels == FRQ_LABELS); @@ -1065,18 +1026,16 @@ dump_full (const struct variable *v, const struct variable *wv) vf = get_var_freqs (v); ft = &vf->tab; n_categories = ft->n_valid + ft->n_missing; - t = tab_create (5 + lab, n_categories + 3, 0); - tab_headers (t, 0, 0, 2, 0); - tab_dim (t, full_dim, NULL); + t = tab_create (5 + lab, n_categories + 2); + tab_headers (t, 0, 0, 1, 0); if (lab) - tab_text (t, 0, 1, TAB_CENTER | TAT_TITLE, _("Value Label")); + tab_text (t, 0, 0, TAB_CENTER | TAT_TITLE, _("Value Label")); - for (p = vec; p->s; p++) - tab_text (t, lab ? p->c : p->c - 1, p->r, - TAB_CENTER | TAT_TITLE, gettext (p->s)); + for (x = 0; x < 5; x++) + tab_text (t, lab + x, 0, TAB_CENTER | TAT_TITLE, gettext (headings[x])); - r = 2; + r = 1; for (f = ft->valid; f < ft->missing; f++) { double percent, valid_percent; @@ -1123,7 +1082,7 @@ dump_full (const struct variable *v, const struct variable *wv) tab_box (t, TAL_1, TAL_1, cmd.spaces == FRQ_SINGLE ? -1 : TAL_GAP, TAL_1, 0, 0, 4 + lab, r); - tab_hline (t, TAL_2, 0, 4 + lab, 2); + tab_hline (t, TAL_2, 0, 4 + lab, 1); tab_hline (t, TAL_2, 0, 4 + lab, r); tab_joint_text (t, 0, r, 0 + lab, r, TAB_RIGHT | TAT_TITLE, _("Total")); tab_vline (t, TAL_0, 1, r, r); @@ -1135,25 +1094,6 @@ dump_full (const struct variable *v, const struct variable *wv) tab_submit (t); } -/* Sets the widths of all the columns and heights of all the rows in - table T for driver D. */ -static void -condensed_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED) -{ - int cum_w = MAX (outp_string_width (d, _("Cum"), OUTP_PROPORTIONAL), - MAX (outp_string_width (d, _("Cum"), OUTP_PROPORTIONAL), - outp_string_width (d, "000", OUTP_PROPORTIONAL))); - - int i; - - for (i = 0; i < 2; i++) - t->w[i] = MAX (tab_natural_width (t, d, i), d->prop_em_width * 8); - for (i = 2; i < 4; i++) - t->w[i] = cum_w; - for (i = 0; i < t->nr; i++) - t->h[i] = d->font_height; -} - /* Display condensed frequency table for variable V. */ static void dump_condensed (const struct variable *v, const struct variable *wv) @@ -1170,7 +1110,7 @@ dump_condensed (const struct variable *v, const struct variable *wv) vf = get_var_freqs (v); ft = &vf->tab; n_categories = ft->n_valid + ft->n_missing; - t = tab_create (4, n_categories + 2, 0); + t = tab_create (4, n_categories + 2); tab_headers (t, 0, 0, 2, 0); tab_text (t, 0, 1, TAB_CENTER | TAT_TITLE, _("Value")); @@ -1178,7 +1118,6 @@ dump_condensed (const struct variable *v, const struct variable *wv) tab_text (t, 2, 1, TAB_CENTER | TAT_TITLE, _("Pct")); tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Cum")); tab_text (t, 3, 1, TAB_CENTER | TAT_TITLE, _("Pct")); - tab_dim (t, condensed_dim, NULL); r = 2; for (f = ft->valid; f < ft->missing; f++) @@ -1208,7 +1147,6 @@ dump_condensed (const struct variable *v, const struct variable *wv) 0, 0, 3, r - 1); tab_hline (t, TAL_2, 0, 3, 2); tab_title (t, "%s", var_to_string (v)); - tab_columns (t, SOM_COL_DOWN, 1); tab_submit (t); } @@ -1376,8 +1314,7 @@ dump_statistics (const struct variable *v, bool show_varname, } calc_stats (v, stat_value); - t = tab_create (3, n_stats + n_percentiles + 2, 0); - tab_dim (t, tab_natural_dimensions, NULL); + t = tab_create (3, n_stats + n_percentiles + 2); tab_box (t, TAL_1, TAL_1, -1, -1 , 0 , 0 , 2, tab_nr(t) - 1) ; @@ -1418,11 +1355,8 @@ dump_statistics (const struct variable *v, bool show_varname, var_get_print_format (v)); } - tab_columns (t, SOM_COL_DOWN, 1); if (show_varname) tab_title (t, "%s", var_to_string (v)); - else - tab_flags (t, SOMF_NO_TITLE); tab_submit (t); @@ -1437,7 +1371,7 @@ freq_tab_to_hist (const struct freq_tab *ft, const struct variable *var) double x_min = DBL_MAX; double x_max = -DBL_MAX; - struct statistic *hist; + struct histogram *hist; const double bins = 11; struct hsh_iterator hi; @@ -1459,10 +1393,10 @@ freq_tab_to_hist (const struct freq_tab *ft, const struct variable *var) for( i = 0 ; i < ft->n_valid ; ++i ) { frq = &ft->valid[i]; - histogram_add ((struct histogram *)hist, frq->value.f, frq->count); + histogram_add (hist, frq->value.f, frq->count); } - return (struct histogram *)hist; + return hist; } @@ -1494,7 +1428,7 @@ freq_tab_to_slice_array(const struct freq_tab *frq_tab, ds_init_empty (&slices[i].label); var_append_value_name (var, &frq->value, &slices[i].label); - slices[i].magnetude = frq->count; + slices[i].magnitude = frq->count; } return slices; @@ -1511,14 +1445,12 @@ do_piechart(const struct variable *var, const struct freq_tab *frq_tab) slices = freq_tab_to_slice_array(frq_tab, var, &n_slices); - piechart_plot(var_to_string(var), slices, n_slices); + chart_item_submit (piechart_create (var_to_string(var), slices, n_slices)); for (i = 0 ; i < n_slices ; ++i ) - { - ds_destroy (&slices[i].label); - } + ds_destroy (&slices[i].label); - free(slices); + free (slices); }