X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.q;h=5460b65f93d8feec4032609f91d038a08f3576b7;hb=19d0debdc5b72e1bb6c79956403a4d3bc054f300;hp=fc2665f70b2d0fa32315edc762b6180b80109f9a;hpb=352548070a3cfea256b5cbe13e18a9aba7b360ed;p=pspp diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index fc2665f70b..5460b65f93 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -68,13 +68,13 @@ /* (specification) FREQUENCIES (frq_): - *variables=custom; - format=cond:condense/onepage(*n:onepage_limit,"%s>=0")/!standard, - table:limit(n:limit,"%s>0")/notable/!table, - labels:!labels/nolabels, - sort:!avalue/dvalue/afreq/dfreq, - spaces:!single/double, - paging:newpage/!oldpage; + *+variables=custom; + +format=cond:condense/onepage(*n:onepage_limit,"%s>=0")/!standard, + table:limit(n:limit,"%s>0")/notable/!table, + labels:!labels/nolabels, + sort:!avalue/dvalue/afreq/dfreq, + spaces:!single/double, + paging:newpage/!oldpage; missing=miss:include/!exclude; barchart(ba_)=:minimum(d:min), :maximum(d:max), @@ -92,12 +92,12 @@ scale:freq(*n:freq,"%s>0")/percent(*n:pcnt,"%s>0"), norm:!nonormal/normal, incr:increment(d:inc,"%s>0"); - grouped=custom; - ntiles=integer; + +grouped=custom; + +ntiles=integer; +percentiles = double list; - statistics[st_]=1|mean,2|semean,3|median,4|mode,5|stddev,6|variance, - 7|kurtosis,8|skewness,9|range,10|minimum,11|maximum,12|sum, - 13|default,14|seskewness,15|sekurtosis,all,none. + +statistics[st_]=1|mean,2|semean,3|median,4|mode,5|stddev,6|variance, + 7|kurtosis,8|skewness,9|range,10|minimum,11|maximum,12|sum, + 13|default,14|seskewness,15|sekurtosis,all,none. */ /* (declarations) */ /* (functions) */ @@ -118,7 +118,7 @@ struct frq_info }; /* Table of statistics, indexed by dsc_*. */ -static struct frq_info st_name[frq_n_stats + 1] = +static const struct frq_info st_name[frq_n_stats + 1] = { {FRQ_ST_MEAN, N_("Mean")}, {FRQ_ST_SEMEAN, N_("S.E. Mean")}, @@ -206,7 +206,7 @@ static struct pool *gen_pool; /* General mode. */ /* Frequency table entry. */ struct freq { - union value v; /* The value. */ + union value *v; /* The value. */ double c; /* The number of occurrences of the value. */ }; @@ -256,10 +256,18 @@ 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. */ + int width; + struct fmt_spec print; }; static inline struct var_freqs * -get_var_freqs (struct variable *v) +get_var_freqs (const struct variable *v) { assert (v != NULL); assert (v->aux != NULL); @@ -270,9 +278,9 @@ static void determine_charts (void); static void calc_stats (struct variable *v, double d[frq_n_stats]); -static void precalc (const struct ccase *, void *); -static bool calc (const struct ccase *, void *); -static void postcalc (void *); +static void precalc (const struct ccase *, void *, const struct dataset *); +static bool calc (const struct ccase *, void *, const struct dataset *); +static bool postcalc (void *, const struct dataset *); static void postprocess_freq_tab (struct variable *); static void dump_full (struct variable *); @@ -297,15 +305,15 @@ freq_tab_to_hist(const struct freq_tab *ft, const struct variable *var); /* Parser and outline. */ -static int internal_cmd_frequencies (void); +static int internal_cmd_frequencies (struct lexer *lexer, struct dataset *ds); int -cmd_frequencies (void) +cmd_frequencies (struct lexer *lexer, struct dataset *ds) { int result; int_pool = pool_create (); - result = internal_cmd_frequencies (); + result = internal_cmd_frequencies (lexer, ds); pool_destroy (int_pool); int_pool=0; pool_destroy (gen_pool); @@ -316,7 +324,7 @@ cmd_frequencies (void) } static int -internal_cmd_frequencies (void) +internal_cmd_frequencies (struct lexer *lexer, struct dataset *ds) { int i; bool ok; @@ -327,7 +335,7 @@ internal_cmd_frequencies (void) n_variables = 0; v_variables = NULL; - if (!parse_frequencies (&cmd)) + if (!parse_frequencies (lexer, ds, &cmd, NULL)) return CMD_FAILURE; if (cmd.onepage_limit == NOT_LONG) @@ -368,7 +376,7 @@ internal_cmd_frequencies (void) int pl; subc_list_double *ptl_list = &cmd.dl_percentiles[i]; for ( pl = 0 ; pl < subc_list_double_count(ptl_list); ++pl) - add_percentile(subc_list_double_at(ptl_list,pl) / 100.0 ); + add_percentile (subc_list_double_at(ptl_list, pl) / 100.0 ); } } if ( cmd.sbc_ntiles ) @@ -377,13 +385,13 @@ internal_cmd_frequencies (void) { int j; for (j = 0; j <= cmd.n_ntiles[i]; ++j ) - add_percentile(j / (double) cmd.n_ntiles[i]); + add_percentile (j / (double) cmd.n_ntiles[i]); } } /* Do it! */ - ok = procedure_with_splits (precalc, calc, postcalc, NULL); + ok = procedure_with_splits (ds, precalc, calc, postcalc, NULL); free_frequencies(&cmd); @@ -497,35 +505,41 @@ determine_charts (void) /* Add data from case C to the frequency table. */ static bool -calc (const struct ccase *c, void *aux UNUSED) +calc (const struct ccase *c, void *aux UNUSED, const struct dataset *ds) { double weight; size_t i; - int bad_warn = 1; + bool bad_warn = true; - weight = dict_get_case_weight (default_dict, c, &bad_warn); + weight = dict_get_case_weight (dataset_dict (ds), c, &bad_warn); for (i = 0; i < n_variables; i++) { - struct variable *v = v_variables[i]; + const struct variable *v = v_variables[i]; const union value *val = case_data (c, v->fv); - struct freq_tab *ft = &get_var_freqs (v)->tab; + struct var_freqs *vf = get_var_freqs (v); + struct freq_tab *ft = &vf->tab; switch (ft->mode) { case FRQM_GENERAL: { - /* General mode. */ - struct freq **fpp = (struct freq **) hsh_probe (ft->data, val); + struct freq target; + struct freq **fpp; + + target.v = (union value *) val; + fpp = (struct freq **) hsh_probe (ft->data, &target); if (*fpp != NULL) (*fpp)->c += weight; else { - struct freq *fp = *fpp = pool_alloc (gen_pool, sizeof *fp); - fp->v = *val; - fp->c = weight; + struct freq *fp = pool_alloc (gen_pool, sizeof *fp); + fp->c = weight; + fp->v = pool_clone (gen_pool, + val, MAX (MAX_SHORT_STRING, vf->width)); + *fpp = fp; } } break; @@ -543,7 +557,7 @@ calc (const struct ccase *c, void *aux UNUSED) ft->out_of_range += weight; break; default: - assert (0); + NOT_REACHED (); } } return true; @@ -552,11 +566,11 @@ calc (const struct ccase *c, void *aux UNUSED) /* Prepares each variable that is the target of FREQUENCIES by setting up its hash table. */ static void -precalc (const struct ccase *first, void *aux UNUSED) +precalc (const struct ccase *first, void *aux UNUSED, const struct dataset *ds) { size_t i; - output_split_file_values (first); + output_split_file_values (ds, first); pool_destroy (gen_pool); gen_pool = pool_create (); @@ -597,8 +611,8 @@ precalc (const struct ccase *first, void *aux UNUSED) /* Finishes up with the variables after frequencies have been calculated. Displays statistics, percentiles, ... */ -static void -postcalc (void *aux UNUSED) +static bool +postcalc (void *aux UNUSED, const struct dataset *ds UNUSED) { size_t i; @@ -631,7 +645,7 @@ postcalc (void *aux UNUSED) dump_full (v); break; default: - assert (0); + NOT_REACHED (); } else dumped_freq_tab = 0; @@ -651,7 +665,7 @@ postcalc (void *aux UNUSED) norm.N = vf->tab.valid_cases; - calc_stats(v,d); + calc_stats (v, d); norm.mean = d[frq_mean]; norm.stddev = d[frq_stddev]; @@ -673,6 +687,8 @@ postcalc (void *aux UNUSED) cleanup_freq_tab (v); } + + return true; } /* Returns the comparison function that should be used for @@ -692,21 +708,21 @@ get_freq_comparator (int frq_sort, int var_type) case FRQ_AFREQ | (ALPHA << 16): return compare_freq_alpha_a; case FRQ_DFREQ | (NUMERIC << 16): return compare_freq_numeric_d; case FRQ_DFREQ | (ALPHA << 16): return compare_freq_alpha_d; - default: assert (0); + default: NOT_REACHED (); } return 0; } -/* Returns nonzero iff the value in struct freq F is non-missing +/* Returns true iff the value in struct freq F is non-missing for variable V. */ -static int -not_missing (const void *f_, void *v_) +static bool +not_missing (const void *f_, const void *v_) { const struct freq *f = f_; - struct variable *v = v_; + const struct variable *v = v_; - return !mv_is_value_missing (&v->miss, &f->v); + return !mv_is_value_missing (&v->miss, f->v); } /* Summarizes the frequency table data for variable V. */ @@ -777,7 +793,7 @@ cleanup_freq_tab (struct variable *v) /* Parses the VARIABLES subcommand, adding to {n_variables,v_variables}. */ static int -frq_custom_variables (struct cmd_frequencies *cmd UNUSED) +frq_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_frequencies *cmd UNUSED, void *aux UNUSED) { int mode; int min = 0, max = 0; @@ -785,31 +801,31 @@ frq_custom_variables (struct cmd_frequencies *cmd UNUSED) size_t old_n_variables = n_variables; size_t i; - lex_match ('='); - if (token != T_ALL && (token != T_ID - || dict_lookup_var (default_dict, tokid) == NULL)) + lex_match (lexer, '='); + if (lex_token (lexer) != T_ALL && (lex_token (lexer) != T_ID + || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)) return 2; - if (!parse_variables (default_dict, &v_variables, &n_variables, + if (!parse_variables (lexer, dataset_dict (ds), &v_variables, &n_variables, PV_APPEND | PV_NO_SCRATCH)) return 0; - if (!lex_match ('(')) + if (!lex_match (lexer, '(')) mode = FRQM_GENERAL; else { mode = FRQM_INTEGER; - if (!lex_force_int ()) + if (!lex_force_int (lexer)) return 0; - min = lex_integer (); - lex_get (); - if (!lex_force_match (',')) + min = lex_integer (lexer); + lex_get (lexer); + if (!lex_force_match (lexer, ',')) return 0; - if (!lex_force_int ()) + if (!lex_force_int (lexer)) return 0; - max = lex_integer (); - lex_get (); - if (!lex_force_match (')')) + max = lex_integer (lexer); + lex_get (lexer); + if (!lex_force_match (lexer, ')')) return 0; if (max < min) { @@ -847,10 +863,17 @@ frq_custom_variables (struct cmd_frequencies *cmd UNUSED) vf->tab.vector = pool_nalloc (int_pool, max - min + 1, sizeof *vf->tab.vector); } - else - vf->tab.vector = NULL; + else + vf->tab.vector = NULL; vf->n_groups = 0; vf->groups = NULL; + vf->width = v->width; + vf->print = v->print; + if (vf->width > MAX_SHORT_STRING && get_algorithm () == COMPATIBLE) + { + vf->width = MAX_SHORT_STRING; + vf->print.w = MAX_SHORT_STRING * (v->print.type == FMT_AHEX ? 2 : 1); + } } return 1; } @@ -858,11 +881,11 @@ frq_custom_variables (struct cmd_frequencies *cmd UNUSED) /* Parses the GROUPED subcommand, setting the n_grouped, grouped fields of specified variables. */ static int -frq_custom_grouped (struct cmd_frequencies *cmd UNUSED) +frq_custom_grouped (struct lexer *lexer, struct dataset *ds, struct cmd_frequencies *cmd UNUSED, void *aux UNUSED) { - lex_match ('='); - if ((token == T_ID && dict_lookup_var (default_dict, tokid) != NULL) - || token == T_ID) + lex_match (lexer, '='); + if ((lex_token (lexer) == T_ID && dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) != NULL) + || lex_token (lexer) == T_ID) for (;;) { size_t i; @@ -875,27 +898,27 @@ frq_custom_grouped (struct cmd_frequencies *cmd UNUSED) size_t n; struct variable **v; - if (!parse_variables (default_dict, &v, &n, + if (!parse_variables (lexer, dataset_dict (ds), &v, &n, PV_NO_DUPLICATE | PV_NUMERIC)) return 0; - if (lex_match ('(')) + if (lex_match (lexer, '(')) { nl = ml = 0; dl = NULL; - while (lex_integer ()) + while (lex_integer (lexer)) { if (nl >= ml) { ml += 16; dl = pool_nrealloc (int_pool, dl, ml, sizeof *dl); } - dl[nl++] = tokval; - lex_get (); - lex_match (','); + dl[nl++] = lex_tokval (lexer); + lex_get (lexer); + lex_match (lexer, ','); } /* Note that nl might still be 0 and dl might still be NULL. That's okay. */ - if (!lex_match (')')) + if (!lex_match (lexer, ')')) { free (v); msg (SE, _("`)' expected after GROUPED interval list.")); @@ -926,12 +949,12 @@ frq_custom_grouped (struct cmd_frequencies *cmd UNUSED) } } free (v); - if (!lex_match ('/')) + if (!lex_match (lexer, '/')) break; - if ((token != T_ID || dict_lookup_var (default_dict, tokid) != NULL) - && token != T_ALL) + if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) != NULL) + && lex_token (lexer) != T_ALL) { - lex_put_back ('/'); + lex_put_back (lexer, '/'); break; } } @@ -956,7 +979,7 @@ add_percentile (double x) break; } - if (i >= n_percentiles || tokval != percentiles[i].p) + if (i >= n_percentiles || x != percentiles[i].p) { percentiles = pool_nrealloc (int_pool, percentiles, n_percentiles + 1, sizeof *percentiles); @@ -974,32 +997,33 @@ add_percentile (double x) /* Hash of numeric values. */ static unsigned -hash_value_numeric (const void *value_, void *foo UNUSED) +hash_value_numeric (const void *value_, const void *aux UNUSED) { const struct freq *value = value_; - return hsh_hash_double (value->v.f); + return hsh_hash_double (value->v[0].f); } /* Hash of string values. */ static unsigned -hash_value_alpha (const void *value_, void *v_) +hash_value_alpha (const void *value_, const void *v_) { const struct freq *value = value_; - struct variable *v = v_; + const struct variable *v = v_; + struct var_freqs *vf = get_var_freqs (v); - return hsh_hash_bytes (value->v.s, MIN (MAX_SHORT_STRING, v->width)); + return hsh_hash_bytes (value->v[0].s, vf->width); } /* Ascending numeric compare of values. */ static int -compare_value_numeric_a (const void *a_, const void *b_, void *foo UNUSED) +compare_value_numeric_a (const void *a_, const void *b_, const void *aux UNUSED) { const struct freq *a = a_; const struct freq *b = b_; - if (a->v.f > b->v.f) + if (a->v[0].f > b->v[0].f) return 1; - else if (a->v.f < b->v.f) + else if (a->v[0].f < b->v[0].f) return -1; else return 0; @@ -1007,25 +1031,26 @@ compare_value_numeric_a (const void *a_, const void *b_, void *foo UNUSED) /* Ascending string compare of values. */ static int -compare_value_alpha_a (const void *a_, const void *b_, void *v_) +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 variable *v = v_; + struct var_freqs *vf = get_var_freqs (v); - return memcmp (a->v.s, b->v.s, MIN (MAX_SHORT_STRING, v->width)); + return memcmp (a->v[0].s, b->v[0].s, vf->width); } /* Descending numeric compare of values. */ static int -compare_value_numeric_d (const void *a, const void *b, void *foo UNUSED) +compare_value_numeric_d (const void *a, const void *b, const void *aux UNUSED) { - return -compare_value_numeric_a (a, b, foo); + return -compare_value_numeric_a (a, b, aux); } /* Descending string compare of values. */ static int -compare_value_alpha_d (const void *a, const void *b, void *v) +compare_value_alpha_d (const void *a, const void *b, const void *v) { return -compare_value_alpha_a (a, b, v); } @@ -1033,7 +1058,7 @@ compare_value_alpha_d (const void *a, const void *b, void *v) /* Ascending numeric compare of frequency; secondary key on ascending numeric value. */ static int -compare_freq_numeric_a (const void *a_, const void *b_, void *foo UNUSED) +compare_freq_numeric_a (const void *a_, const void *b_, const void *aux UNUSED) { const struct freq *a = a_; const struct freq *b = b_; @@ -1043,9 +1068,9 @@ compare_freq_numeric_a (const void *a_, const void *b_, void *foo UNUSED) else if (a->c < b->c) return -1; - if (a->v.f > b->v.f) + if (a->v[0].f > b->v[0].f) return 1; - else if (a->v.f < b->v.f) + else if (a->v[0].f < b->v[0].f) return -1; else return 0; @@ -1054,24 +1079,25 @@ compare_freq_numeric_a (const void *a_, const void *b_, void *foo UNUSED) /* Ascending numeric compare of frequency; secondary key on ascending string value. */ static int -compare_freq_alpha_a (const void *a_, const void *b_, void *v_) +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 variable *v = v_; + struct var_freqs *vf = get_var_freqs (v); if (a->c > b->c) return 1; else if (a->c < b->c) return -1; else - return memcmp (a->v.s, b->v.s, MIN (MAX_SHORT_STRING, v->width)); + return memcmp (a->v[0].s, b->v[0].s, vf->width); } /* Descending numeric compare of frequency; secondary key on ascending numeric value. */ static int -compare_freq_numeric_d (const void *a_, const void *b_, void *foo UNUSED) +compare_freq_numeric_d (const void *a_, const void *b_, const void *aux UNUSED) { const struct freq *a = a_; const struct freq *b = b_; @@ -1081,9 +1107,9 @@ compare_freq_numeric_d (const void *a_, const void *b_, void *foo UNUSED) else if (a->c < b->c) return 1; - if (a->v.f > b->v.f) + if (a->v[0].f > b->v[0].f) return 1; - else if (a->v.f < b->v.f) + else if (a->v[0].f < b->v[0].f) return -1; else return 0; @@ -1092,18 +1118,19 @@ compare_freq_numeric_d (const void *a_, const void *b_, void *foo UNUSED) /* Descending numeric compare of frequency; secondary key on ascending string value. */ static int -compare_freq_alpha_d (const void *a_, const void *b_, void *v_) +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 variable *v = v_; + struct var_freqs *vf = get_var_freqs (v); if (a->c > b->c) return -1; else if (a->c < b->c) return 1; else - return memcmp (a->v.s, b->v.s, MIN (MAX_SHORT_STRING, v->width)); + return memcmp (a->v[0].s, b->v[0].s, vf->width); } /* Frequency table display. */ @@ -1117,9 +1144,9 @@ full_dim (struct tab_table *t, struct outp_driver *d) int i; if (lab) - t->w[0] = min (tab_natural_width (t, d, 0), d->prop_em_width * 15); + t->w[0] = MIN (tab_natural_width (t, d, 0), d->prop_em_width * 15); for (i = lab; i < lab + 5; i++) - t->w[i] = max (tab_natural_width (t, d, i), d->prop_em_width * 8); + 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; } @@ -1129,13 +1156,13 @@ static void dump_full (struct variable *v) { int n_categories; + struct var_freqs *vf; struct freq_tab *ft; struct freq *f; struct tab_table *t; int r; double cum_total = 0.0; double cum_freq = 0.0; - struct fmt_spec fmt; struct init { @@ -1143,9 +1170,9 @@ dump_full (struct variable *v) const char *s; }; - struct init *p; + const struct init *p; - static struct init vec[] = + static const struct init vec[] = { {4, 0, N_("Valid")}, {5, 0, N_("Cum")}, @@ -1163,7 +1190,8 @@ dump_full (struct variable *v) int lab = cmd.labels == FRQ_LABELS; - ft = &get_var_freqs (v)->tab; + 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); @@ -1175,10 +1203,6 @@ dump_full (struct variable *v) tab_text (t, p->c - (p->r ? !lab : 0), p->r, TAB_CENTER | TAT_TITLE, gettext (p->s)); - fmt = v->print; - if (v->width > MAX_SHORT_STRING) - fmt.w = MAX_SHORT_STRING * (fmt.type == FMT_AHEX ? 2 : 1); - r = 2; for (f = ft->valid; f < ft->missing; f++) { @@ -1192,12 +1216,12 @@ dump_full (struct variable *v) if (lab) { - const char *label = val_labs_find (v->val_labs, f->v); + const char *label = val_labs_find (v->val_labs, f->v[0]); if (label != NULL) tab_text (t, 0, r, TAB_LEFT, label); } - tab_value (t, 0 + lab, r, TAB_NONE, &f->v, &fmt); + tab_value (t, 0 + lab, r, TAB_NONE, f->v, &vf->print); tab_float (t, 1 + lab, r, TAB_NONE, f->c, 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); @@ -1210,12 +1234,12 @@ dump_full (struct variable *v) if (lab) { - const char *label = val_labs_find (v->val_labs, f->v); + const char *label = val_labs_find (v->val_labs, f->v[0]); if (label != NULL) tab_text (t, 0, r, TAB_LEFT, label); } - tab_value (t, 0 + lab, r, TAB_NONE, &f->v, &fmt); + tab_value (t, 0 + lab, r, TAB_NONE, f->v, &vf->print); tab_float (t, 1 + lab, r, TAB_NONE, f->c, 8, 0); tab_float (t, 2 + lab, r, TAB_NONE, f->c / ft->total_cases * 100.0, 5, 1); @@ -1244,14 +1268,14 @@ dump_full (struct variable *v) static void condensed_dim (struct tab_table *t, struct outp_driver *d) { - int cum_w = max (outp_string_width (d, _("Cum"), OUTP_PROPORTIONAL), - max (outp_string_width (d, _("Cum"), OUTP_PROPORTIONAL), + 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); + 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++) @@ -1263,14 +1287,15 @@ static void dump_condensed (struct variable *v) { int n_categories; + struct var_freqs *vf; struct freq_tab *ft; struct freq *f; struct tab_table *t; int r; double cum_total = 0.0; - struct fmt_spec fmt; - ft = &get_var_freqs (v)->tab; + vf = get_var_freqs (v); + ft = &vf->tab; n_categories = ft->n_valid + ft->n_missing; t = tab_create (4, n_categories + 2, 0); @@ -1282,10 +1307,6 @@ dump_condensed (struct variable *v) tab_text (t, 3, 1, TAB_CENTER | TAT_TITLE, _("Pct")); tab_dim (t, condensed_dim); - fmt = v->print; - if (v->width > MAX_SHORT_STRING) - fmt.w = MAX_SHORT_STRING * (fmt.type == FMT_AHEX ? 2 : 1); - r = 2; for (f = ft->valid; f < ft->missing; f++) { @@ -1294,7 +1315,7 @@ dump_condensed (struct variable *v) percent = f->c / ft->total_cases * 100.0; cum_total += f->c / ft->valid_cases * 100.0; - tab_value (t, 0, r, TAB_NONE, &f->v, &fmt); + tab_value (t, 0, r, TAB_NONE, f->v, &vf->print); tab_float (t, 1, r, TAB_NONE, f->c, 8, 0); tab_float (t, 2, r, TAB_NONE, percent, 3, 0); tab_float (t, 3, r, TAB_NONE, cum_total, 3, 0); @@ -1302,7 +1323,7 @@ dump_condensed (struct variable *v) } for (; f < &ft->valid[n_categories]; f++) { - tab_value (t, 0, r, TAB_NONE, &f->v, &fmt); + tab_value (t, 0, r, TAB_NONE, f->v, &vf->print); tab_float (t, 1, r, TAB_NONE, f->c, 8, 0); tab_float (t, 2, r, TAB_NONE, f->c / ft->total_cases * 100.0, 3, 0); @@ -1383,7 +1404,7 @@ calc_stats (struct variable *v, double d[frq_n_stats]) if ( percentiles[i].flag ) { - percentiles[i].x2 = f->v.f; + percentiles[i].x2 = f->v[0].f; percentiles[i].x1 = prev_value; percentiles[i].flag2 = 1; continue; @@ -1393,7 +1414,7 @@ calc_stats (struct variable *v, double d[frq_n_stats]) { if ( f->c > 1 && rank - (f->c - 1) > tp ) { - percentiles[i].x2 = percentiles[i].x1 = f->v.f; + percentiles[i].x2 = percentiles[i].x1 = f->v[0].f; percentiles[i].flag2 = 1; } else @@ -1404,14 +1425,14 @@ calc_stats (struct variable *v, double d[frq_n_stats]) continue; } } - prev_value = f->v.f; + prev_value = f->v[0].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->v.f; + percentiles[i].x1 = percentiles[i].x2 = f->v[0].f; /* printf("percentile %d (p==%.2f); X1 = %g; X2 = %g\n", @@ -1450,7 +1471,7 @@ calc_stats (struct variable *v, double d[frq_n_stats]) if (most_often < f->c) { most_often = f->c; - X_mode = f->v.f; + X_mode = f->v[0].f; } else if (most_often == f->c) { @@ -1463,16 +1484,16 @@ calc_stats (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->v.f, f->c); + moments_pass_one (m, f->v[0].f, f->c); for (f = ft->valid; f < ft->missing; f++) - moments_pass_two (m, f->v.f, f->c); + moments_pass_two (m, f->v[0].f, f->c); 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].v.f; - d[frq_max] = ft->valid[ft->n_valid - 1].v.f; + d[frq_min] = ft->valid[0].v[0].f; + d[frq_max] = ft->valid[ft->n_valid - 1].v[0].f; d[frq_mode] = X_mode; d[frq_range] = d[frq_max] - d[frq_min]; d[frq_median] = *median_value; @@ -1582,11 +1603,11 @@ freq_tab_to_hist(const struct freq_tab *ft, const struct variable *var) /* Find out the extremes of the x value */ for ( frq = hsh_first(fh, &hi); frq != 0; frq = hsh_next(fh, &hi) ) { - if ( mv_is_value_missing(&var->miss, &frq->v)) + if ( mv_is_value_missing(&var->miss, frq->v)) continue; - if ( frq->v.f < x_min ) x_min = frq->v.f ; - if ( frq->v.f > x_max ) x_max = frq->v.f ; + if ( frq->v[0].f < x_min ) x_min = frq->v[0].f ; + if ( frq->v[0].f > x_max ) x_max = frq->v[0].f ; } hist = histogram_create(bins, x_min, x_max); @@ -1594,7 +1615,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]; - gsl_histogram_accumulate(hist, frq->v.f, frq->c); + gsl_histogram_accumulate(hist, frq->v[0].f, frq->c); } return hist; @@ -1627,7 +1648,7 @@ freq_tab_to_slice_array(const struct freq_tab *frq_tab, { const struct freq *frq = &frq_tab->valid[i]; - slices[i].label = value_to_string(&frq->v, var); + slices[i].label = value_to_string(frq->v, var); slices[i].magnetude = frq->c; }