X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.q;h=83b864c9f695c4494c5b5f2204b9d4ecd0054c46;hb=44c2b035a7526fdf366271de915fc774df302f96;hp=cd370be821c8db73f2d88da8350613a7ea8c07b0;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp-builds.git diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index cd370be8..83b864c9 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -205,10 +205,12 @@ static struct pool *syntax_pool; /* For syntax-related data. */ struct freq_tab { struct hsh_table *data; /* Undifferentiated data. */ - struct freq *valid; /* Valid freqs. */ + struct freq_mutable *valid; /* Valid freqs. */ int n_valid; /* Number of total freqs. */ + const struct dictionary *dict; /* The dict from whence entries in the table + come */ - struct freq *missing; /* Missing freqs. */ + struct freq_mutable *missing; /* Missing freqs. */ int n_missing; /* Number of missing freqs. */ /* Statistics. */ @@ -230,11 +232,7 @@ struct var_freqs /* Statistics. */ double stat[frq_n_stats]; - /* Width and format for analysis and display. - This is normally the same as "width" and "print" in struct - variable, but in SPSS-compatible mode only the first - MAX_SHORT_STRING bytes of long string variables are - included. */ + /* Variable attributes. */ int width; struct fmt_spec print; }; @@ -251,12 +249,12 @@ static void calc_stats (const struct variable *v, double d[frq_n_stats]); static void precalc (struct casereader *, struct dataset *); static void calc (const struct ccase *, const struct dataset *); -static void postcalc (void); +static void postcalc (const struct dataset *); static void postprocess_freq_tab (const struct variable *); -static void dump_full (const struct variable *); -static void dump_condensed (const struct variable *); -static void dump_statistics (const struct variable *, int show_varname); +static void dump_full ( const struct variable *, const struct variable *); +static void dump_condensed (const struct variable *, const struct variable *); +static void dump_statistics (const struct variable *, bool show_varname, const struct variable *); static void cleanup_freq_tab (const struct variable *); static hsh_compare_func compare_value_numeric_a, compare_value_alpha_a; @@ -381,7 +379,7 @@ internal_cmd_frequencies (struct lexer *lexer, struct dataset *ds) precalc (group, ds); for (; (c = casereader_read (group)) != NULL; case_unref (c)) calc (c, ds); - postcalc (); + postcalc (ds); } ok = casegrouper_destroy (grouper); ok = proc_commit (ds) && ok; @@ -510,21 +508,20 @@ calc (const struct ccase *c, const struct dataset *ds) struct var_freqs *vf = get_var_freqs (v); struct freq_tab *ft = &vf->tab; - struct freq target; - struct freq **fpp; + struct freq_mutable target; + struct freq_mutable **fpp; - target.value = (union value *) val; - fpp = (struct freq **) hsh_probe (ft->data, &target); + target.value = *val; + fpp = (struct freq_mutable **) hsh_probe (ft->data, &target); if (*fpp != NULL) (*fpp)->count += weight; else { - struct freq *fp = pool_alloc (data_pool, sizeof *fp); + struct freq_mutable *fp = pool_alloc (data_pool, sizeof *fp); fp->count = weight; - fp->value = pool_clone (data_pool, - val, - MAX (MAX_SHORT_STRING, vf->width)); + value_init_pool (data_pool, &fp->value, vf->width); + value_copy (&fp->value, val, vf->width); *fpp = fp; } } @@ -560,8 +557,10 @@ precalc (struct casereader *input, struct dataset *ds) /* Finishes up with the variables after frequencies have been calculated. Displays statistics, percentiles, ... */ static void -postcalc (void) +postcalc (const struct dataset *ds) { + const struct dictionary *dict = dataset_dict (ds); + const struct variable *wv = dict_get_weight (dict); size_t i; for (i = 0; i < n_variables; i++) @@ -581,16 +580,16 @@ postcalc (void) switch (cmd.cond) { case FRQ_CONDENSE: - dump_condensed (v); + dump_condensed (v, wv); break; case FRQ_STANDARD: - dump_full (v); + dump_full (v, wv); break; case FRQ_ONEPAGE: if (n_categories > cmd.onepage_limit) - dump_condensed (v); + dump_condensed (v, wv); else - dump_full (v); + dump_full (v, wv); break; default: NOT_REACHED (); @@ -600,11 +599,11 @@ postcalc (void) /* Statistics. */ if (n_stats) - dump_statistics (v, !dumped_freq_tab); + dump_statistics (v, !dumped_freq_tab, wv); - if ( chart == GFT_HIST) + if ( chart == GFT_HIST && var_is_numeric (v) ) { double d[frq_n_stats]; struct histogram *hist ; @@ -654,15 +653,15 @@ get_freq_comparator (int frq_sort, enum val_type val_type) } } -/* Returns true iff the value in struct freq F is non-missing +/* Returns true iff the value in struct freq_mutable F is non-missing for variable V. */ static bool not_missing (const void *f_, const void *v_) { - const struct freq *f = f_; + const struct freq_mutable *f = f_; const struct variable *v = v_; - return !var_is_value_missing (v, f->value, MV_ANY); + return !var_is_value_missing (v, &f->value, MV_ANY); } /* Summarizes the frequency table data for variable V. */ @@ -673,7 +672,7 @@ postprocess_freq_tab (const struct variable *v) struct freq_tab *ft; size_t count; void *const *data; - struct freq *freqs, *f; + struct freq_mutable *freqs, *f; size_t i; ft = &get_var_freqs (v)->tab; @@ -687,7 +686,7 @@ postprocess_freq_tab (const struct variable *v) freqs = xnmalloc (count, sizeof *freqs); for (i = 0; i < count; i++) { - struct freq *f = data[i]; + struct freq_mutable *f = data[i]; freqs[i] = *f; } @@ -758,16 +757,11 @@ frq_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_freque } vf = var_attach_aux (v, xmalloc (sizeof *vf), var_dtor_free); vf->tab.valid = vf->tab.missing = NULL; + vf->tab.dict = dataset_dict (ds); vf->n_groups = 0; vf->groups = NULL; vf->width = var_get_width (v); vf->print = *var_get_print_format (v); - if (vf->width > MAX_SHORT_STRING && settings_get_algorithm () == COMPATIBLE) - { - enum fmt_type type = var_get_print_format (v)->type; - vf->width = MAX_SHORT_STRING; - vf->print.w = MAX_SHORT_STRING * (type == FMT_AHEX ? 2 : 1); - } } return 1; } @@ -889,12 +883,12 @@ add_percentile (double x) static int compare_value_numeric_a (const void *a_, const void *b_, const void *aux UNUSED) { - const struct freq *a = a_; - const struct freq *b = b_; + const struct freq_mutable *a = a_; + const struct freq_mutable *b = b_; - if (a->value[0].f > b->value[0].f) + if (a->value.f > b->value.f) return 1; - else if (a->value[0].f < b->value[0].f) + else if (a->value.f < b->value.f) return -1; else return 0; @@ -904,12 +898,12 @@ compare_value_numeric_a (const void *a_, const void *b_, const void *aux UNUSED) static int compare_value_alpha_a (const void *a_, const void *b_, const void *v_) { - const struct freq *a = a_; - const struct freq *b = b_; + const struct freq_mutable *a = a_; + const struct freq_mutable *b = b_; const struct variable *v = v_; struct var_freqs *vf = get_var_freqs (v); - return memcmp (a->value[0].s, b->value[0].s, vf->width); + return value_compare_3way (&a->value, &b->value, vf->width); } /* Descending numeric compare of values. */ @@ -931,17 +925,17 @@ compare_value_alpha_d (const void *a, const void *b, const void *v) static int compare_freq_numeric_a (const void *a_, const void *b_, const void *aux UNUSED) { - const struct freq *a = a_; - const struct freq *b = b_; + const struct freq_mutable *a = a_; + const struct freq_mutable *b = b_; if (a->count > b->count) return 1; else if (a->count < b->count) return -1; - if (a->value[0].f > b->value[0].f) + if (a->value.f > b->value.f) return 1; - else if (a->value[0].f < b->value[0].f) + else if (a->value.f < b->value.f) return -1; else return 0; @@ -952,8 +946,8 @@ compare_freq_numeric_a (const void *a_, const void *b_, const void *aux UNUSED) static int compare_freq_alpha_a (const void *a_, const void *b_, const void *v_) { - const struct freq *a = a_; - const struct freq *b = b_; + const struct freq_mutable *a = a_; + const struct freq_mutable *b = b_; const struct variable *v = v_; struct var_freqs *vf = get_var_freqs (v); @@ -962,7 +956,7 @@ compare_freq_alpha_a (const void *a_, const void *b_, const void *v_) else if (a->count < b->count) return -1; else - return memcmp (a->value[0].s, b->value[0].s, vf->width); + return value_compare_3way (&a->value, &b->value, vf->width); } /* Descending numeric compare of frequency; @@ -970,17 +964,17 @@ compare_freq_alpha_a (const void *a_, const void *b_, const void *v_) static int compare_freq_numeric_d (const void *a_, const void *b_, const void *aux UNUSED) { - const struct freq *a = a_; - const struct freq *b = b_; + const struct freq_mutable *a = a_; + const struct freq_mutable *b = b_; if (a->count > b->count) return -1; else if (a->count < b->count) return 1; - if (a->value[0].f > b->value[0].f) + if (a->value.f > b->value.f) return 1; - else if (a->value[0].f < b->value[0].f) + else if (a->value.f < b->value.f) return -1; else return 0; @@ -991,8 +985,8 @@ compare_freq_numeric_d (const void *a_, const void *b_, const void *aux UNUSED) static int compare_freq_alpha_d (const void *a_, const void *b_, const void *v_) { - const struct freq *a = a_; - const struct freq *b = b_; + const struct freq_mutable *a = a_; + const struct freq_mutable *b = b_; const struct variable *v = v_; struct var_freqs *vf = get_var_freqs (v); @@ -1001,7 +995,7 @@ compare_freq_alpha_d (const void *a_, const void *b_, const void *v_) else if (a->count < b->count) return 1; else - return memcmp (a->value[0].s, b->value[0].s, vf->width); + return value_compare_3way (&a->value, &b->value, vf->width); } /* Frequency table display. */ @@ -1009,7 +1003,7 @@ compare_freq_alpha_d (const void *a_, const void *b_, const void *v_) /* 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) +full_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED) { int i = 0; int columns = 5; @@ -1030,12 +1024,13 @@ full_dim (struct tab_table *t, struct outp_driver *d) /* Displays a full frequency table for variable V. */ static void -dump_full (const struct variable *v) +dump_full (const struct variable *v, const struct variable *wv) { + const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0; int n_categories; struct var_freqs *vf; struct freq_tab *ft; - struct freq *f; + struct freq_mutable *f; struct tab_table *t; int r; double cum_total = 0.0; @@ -1072,7 +1067,7 @@ dump_full (const struct variable *v) 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); + tab_dim (t, full_dim, NULL); if (lab) tab_text (t, 0, 1, TAB_CENTER | TAT_TITLE, _("Value Label")); @@ -1094,16 +1089,16 @@ dump_full (const struct variable *v) if (lab) { - const char *label = var_lookup_value_label (v, &f->value[0]); + const char *label = var_lookup_value_label (v, &f->value); if (label != NULL) tab_text (t, 0, r, TAB_LEFT, label); } - tab_value (t, 0 + lab, r, TAB_NONE, f->value, &vf->print); - tab_float (t, 1 + lab, r, TAB_NONE, f->count, 8, 0); - tab_float (t, 2 + lab, r, TAB_NONE, percent, 5, 1); - tab_float (t, 3 + lab, r, TAB_NONE, valid_percent, 5, 1); - tab_float (t, 4 + lab, r, TAB_NONE, cum_total, 5, 1); + tab_value (t, 0 + lab, r, TAB_NONE, &f->value, ft->dict, &vf->print); + tab_double (t, 1 + lab, r, TAB_NONE, f->count, wfmt); + tab_double (t, 2 + lab, r, TAB_NONE, percent, NULL); + tab_double (t, 3 + lab, r, TAB_NONE, valid_percent, NULL); + tab_double (t, 4 + lab, r, TAB_NONE, cum_total, NULL); r++; } for (; f < &ft->valid[n_categories]; f++) @@ -1112,15 +1107,15 @@ dump_full (const struct variable *v) if (lab) { - const char *label = var_lookup_value_label (v, &f->value[0]); + const char *label = var_lookup_value_label (v, &f->value); if (label != NULL) tab_text (t, 0, r, TAB_LEFT, label); } - tab_value (t, 0 + lab, r, TAB_NONE, f->value, &vf->print); - tab_float (t, 1 + lab, r, TAB_NONE, f->count, 8, 0); - tab_float (t, 2 + lab, r, TAB_NONE, - f->count / ft->total_cases * 100.0, 5, 1); + tab_value (t, 0 + lab, r, TAB_NONE, &f->value, ft->dict, &vf->print); + tab_double (t, 1 + lab, r, TAB_NONE, f->count, wfmt); + tab_double (t, 2 + lab, r, TAB_NONE, + f->count / ft->total_cases * 100.0, NULL); tab_text (t, 3 + lab, r, TAB_NONE, _("Missing")); r++; } @@ -1132,9 +1127,9 @@ dump_full (const struct variable *v) 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); - tab_float (t, 1 + lab, r, TAB_NONE, cum_freq, 8, 0); - tab_float (t, 2 + lab, r, TAB_NONE, 100.0, 5, 1); - tab_float (t, 3 + lab, r, TAB_NONE, 100.0, 5, 1); + tab_double (t, 1 + lab, r, TAB_NONE, cum_freq, wfmt); + tab_fixed (t, 2 + lab, r, TAB_NONE, 100.0, 5, 1); + tab_fixed (t, 3 + lab, r, TAB_NONE, 100.0, 5, 1); tab_title (t, "%s", var_to_string (v)); tab_submit (t); @@ -1143,7 +1138,7 @@ dump_full (const struct variable *v) /* 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) +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), @@ -1161,12 +1156,13 @@ condensed_dim (struct tab_table *t, struct outp_driver *d) /* Display condensed frequency table for variable V. */ static void -dump_condensed (const struct variable *v) +dump_condensed (const struct variable *v, const struct variable *wv) { + const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0; int n_categories; struct var_freqs *vf; struct freq_tab *ft; - struct freq *f; + struct freq_mutable *f; struct tab_table *t; int r; double cum_total = 0.0; @@ -1182,7 +1178,7 @@ dump_condensed (const struct variable *v) 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); + tab_dim (t, condensed_dim, NULL); r = 2; for (f = ft->valid; f < ft->missing; f++) @@ -1192,18 +1188,18 @@ dump_condensed (const struct variable *v) percent = f->count / ft->total_cases * 100.0; cum_total += f->count / ft->valid_cases * 100.0; - tab_value (t, 0, r, TAB_NONE, f->value, &vf->print); - tab_float (t, 1, r, TAB_NONE, f->count, 8, 0); - tab_float (t, 2, r, TAB_NONE, percent, 3, 0); - tab_float (t, 3, r, TAB_NONE, cum_total, 3, 0); + tab_value (t, 0, r, TAB_NONE, &f->value, ft->dict, &vf->print); + tab_double (t, 1, r, TAB_NONE, f->count, wfmt); + tab_double (t, 2, r, TAB_NONE, percent, NULL); + tab_double (t, 3, r, TAB_NONE, cum_total, NULL); r++; } for (; f < &ft->valid[n_categories]; f++) { - tab_value (t, 0, r, TAB_NONE, f->value, &vf->print); - tab_float (t, 1, r, TAB_NONE, f->count, 8, 0); - tab_float (t, 2, r, TAB_NONE, - f->count / ft->total_cases * 100.0, 3, 0); + tab_value (t, 0, r, TAB_NONE, &f->value, ft->dict, &vf->print); + tab_double (t, 1, r, TAB_NONE, f->count, wfmt); + tab_double (t, 2, r, TAB_NONE, + f->count / ft->total_cases * 100.0, NULL); r++; } @@ -1226,7 +1222,7 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) struct freq_tab *ft = &get_var_freqs (v)->tab; double W = ft->valid_cases; struct moments *m; - struct freq *f=0; + struct freq_mutable *f=0; int most_often; double X_mode; @@ -1262,7 +1258,7 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) if ( percentiles[i].flag ) { - percentiles[i].x2 = f->value[0].f; + percentiles[i].x2 = f->value.f; percentiles[i].x1 = prev_value; percentiles[i].flag2 = 1; continue; @@ -1272,7 +1268,7 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) { if ( f->count > 1 && rank - (f->count - 1) > tp ) { - percentiles[i].x2 = percentiles[i].x1 = f->value[0].f; + percentiles[i].x2 = percentiles[i].x1 = f->value.f; percentiles[i].flag2 = 1; } else @@ -1283,14 +1279,14 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) continue; } } - prev_value = f->value[0].f; + prev_value = f->value.f; } for (i = 0; i < n_percentiles; i++) { /* Catches the case when p == 100% */ if ( ! percentiles[i].flag2 ) - percentiles[i].x1 = percentiles[i].x2 = f->value[0].f; + percentiles[i].x1 = percentiles[i].x2 = f->value.f; /* printf("percentile %d (p==%.2f); X1 = %g; X2 = %g\n", @@ -1326,7 +1322,7 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) if (most_often < f->count) { most_often = f->count; - X_mode = f->value[0].f; + X_mode = f->value.f; } else if (most_often == f->count) { @@ -1339,16 +1335,16 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) /* Calculate moments. */ m = moments_create (MOMENT_KURTOSIS); for (f = ft->valid; f < ft->missing; f++) - moments_pass_one (m, f->value[0].f, f->count); + moments_pass_one (m, f->value.f, f->count); for (f = ft->valid; f < ft->missing; f++) - moments_pass_two (m, f->value[0].f, f->count); + moments_pass_two (m, f->value.f, f->count); moments_calculate (m, NULL, &d[frq_mean], &d[frq_variance], &d[frq_skew], &d[frq_kurt]); moments_destroy (m); /* Formulas below are taken from _SPSS Statistical Algorithms_. */ - d[frq_min] = ft->valid[0].value[0].f; - d[frq_max] = ft->valid[ft->n_valid - 1].value[0].f; + d[frq_min] = ft->valid[0].value.f; + d[frq_max] = ft->valid[ft->n_valid - 1].value.f; d[frq_mode] = X_mode; d[frq_range] = d[frq_max] - d[frq_min]; d[frq_sum] = d[frq_mean] * W; @@ -1360,8 +1356,10 @@ calc_stats (const struct variable *v, double d[frq_n_stats]) /* Displays a table of all the statistics requested for variable V. */ static void -dump_statistics (const struct variable *v, int show_varname) +dump_statistics (const struct variable *v, bool show_varname, + const struct variable *wv) { + const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0; struct freq_tab *ft; double stat_value[frq_n_stats]; struct tab_table *t; @@ -1379,7 +1377,7 @@ dump_statistics (const struct variable *v, int show_varname) calc_stats (v, stat_value); t = tab_create (3, n_stats + n_percentiles + 2, 0); - tab_dim (t, tab_natural_dimensions); + tab_dim (t, tab_natural_dimensions, NULL); tab_box (t, TAL_1, TAL_1, -1, -1 , 0 , 0 , 2, tab_nr(t) - 1) ; @@ -1394,7 +1392,7 @@ dump_statistics (const struct variable *v, int show_varname) { tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, gettext (st_name[i].s10)); - tab_float (t, 2, r, TAB_NONE, stat_value[i], 11, 3); + tab_double (t, 2, r, TAB_NONE, stat_value[i], NULL); r++; } @@ -1402,9 +1400,8 @@ dump_statistics (const struct variable *v, int show_varname) tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Valid")); tab_text (t, 1, 1, TAB_LEFT | TAT_TITLE, _("Missing")); - tab_float(t, 2, 0, TAB_NONE, ft->valid_cases, 11, 0); - tab_float(t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, 11, 0); - + tab_double (t, 2, 0, TAB_NONE, ft->valid_cases, wfmt); + tab_double (t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, wfmt); for (i = 0; i < n_percentiles; i++, r++) { @@ -1416,9 +1413,9 @@ dump_statistics (const struct variable *v, int show_varname) if (percentiles[i].p == 0.5) tab_text (t, 1, r, TAB_LEFT, _("50 (Median)")); else - tab_float (t, 1, r, TAB_LEFT, percentiles[i].p * 100, 3, 0); - tab_float (t, 2, r, TAB_NONE, percentiles[i].value, 11, 3); - + tab_fixed (t, 1, r, TAB_LEFT, percentiles[i].p * 100, 3, 0); + tab_double (t, 2, r, TAB_NONE, percentiles[i].value, + var_get_print_format (v)); } tab_columns (t, SOM_COL_DOWN, 1); @@ -1445,16 +1442,16 @@ freq_tab_to_hist (const struct freq_tab *ft, const struct variable *var) struct hsh_iterator hi; struct hsh_table *fh = ft->data; - struct freq *frq; + struct freq_mutable *frq; /* Find out the extremes of the x value */ for ( frq = hsh_first(fh, &hi); frq != 0; frq = hsh_next(fh, &hi) ) { - if (var_is_value_missing(var, frq->value, MV_ANY)) + if (var_is_value_missing(var, &frq->value, MV_ANY)) continue; - if ( frq->value[0].f < x_min ) x_min = frq->value[0].f ; - if ( frq->value[0].f > x_max ) x_max = frq->value[0].f ; + if ( frq->value.f < x_min ) x_min = frq->value.f ; + if ( frq->value.f > x_max ) x_max = frq->value.f ; } hist = histogram_create (bins, x_min, x_max); @@ -1462,7 +1459,7 @@ 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[0].f, frq->count); + histogram_add ((struct histogram *)hist, frq->value.f, frq->count); } return (struct histogram *)hist; @@ -1493,10 +1490,10 @@ freq_tab_to_slice_array(const struct freq_tab *frq_tab, for (i = 0 ; i < *n_slices ; ++i ) { - const struct freq *frq = &frq_tab->valid[i]; + const struct freq_mutable *frq = &frq_tab->valid[i]; ds_init_empty (&slices[i].label); - var_append_value_name (var, frq->value, &slices[i].label); + var_append_value_name (var, &frq->value, &slices[i].label); slices[i].magnetude = frq->count; }