X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.c;h=c4bab00fc36081b15aa368ec5b57dc89b7088dfe;hb=3c5630105991133a09971a4c107141767a2c7d0c;hp=6c6f6cedc7d8fa9758b23ca0fc55d816aa068240;hpb=ff0f5192a578cb9297dc57c88e84096feabf9491;p=pspp diff --git a/src/data/variable.c b/src/data/variable.c index 6c6f6cedc7..c4bab00fc3 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,6 +58,7 @@ struct variable /* GUI information. */ enum measure measure; /* Nominal, ordinal, or continuous. */ + enum var_role role; /* Intended use. */ int display_width; /* Width of data editor column. */ enum alignment alignment; /* Alignment of data in GUI. */ @@ -77,6 +78,8 @@ struct variable }; +static void var_set_print_format_quiet (struct variable *v, const struct fmt_spec *print); +static void var_set_write_format_quiet (struct variable *v, const struct fmt_spec *write); static bool var_set_label_quiet (struct variable *v, const char *label, bool issue_warning); static void var_set_name_quiet (struct variable *v, const char *name); @@ -100,6 +103,7 @@ var_create (const char *name, int width) type = val_type_from_width (width); v->alignment = var_default_alignment (type); v->measure = var_default_measure (type); + v->role = ROLE_INPUT; v->display_width = var_default_display_width (width); v->print = v->write = var_default_formats (width); attrset_init (&v->attributes); @@ -160,8 +164,9 @@ var_set_name_quiet (struct variable *v, const char *name) void var_set_name (struct variable *v, const char *name) { + struct variable *ov = var_clone (v); var_set_name_quiet (v, name); - dict_var_changed (v, VAR_TRAIT_NAME); + dict_var_changed (v, VAR_TRAIT_NAME, ov); } /* Returns VAR's dictionary class. */ @@ -241,22 +246,25 @@ var_get_width (const struct variable *v) return v->width; } -/* Changes the width of V to NEW_WIDTH. - This function should be used cautiously. */ void -var_set_width (struct variable *v, int new_width) +var_set_width_and_formats (struct variable *v, int new_width, + const struct fmt_spec *print, const struct fmt_spec *write) { - const int old_width = v->width; + struct variable *ov; + unsigned int traits = 0; - if (old_width == new_width) - return; + ov = var_clone (v); - if (mv_is_resizable (&v->miss, new_width)) - mv_resize (&v->miss, new_width); - else + if (var_has_missing_values (v)) { - mv_destroy (&v->miss); - mv_init (&v->miss, new_width); + if (mv_is_resizable (&v->miss, new_width)) + mv_resize (&v->miss, new_width); + else + { + mv_destroy (&v->miss); + mv_init (&v->miss, new_width); + } + traits |= VAR_TRAIT_MISSING_VALUES; } if (v->val_labs != NULL) @@ -268,16 +276,53 @@ var_set_width (struct variable *v, int new_width) val_labs_destroy (v->val_labs); v->val_labs = NULL; } + traits |= VAR_TRAIT_VALUE_LABELS; } - fmt_resize (&v->print, new_width); - fmt_resize (&v->write, new_width); + if (fmt_resize (&v->print, new_width)) + traits |= VAR_TRAIT_PRINT_FORMAT; + + if (fmt_resize (&v->write, new_width)) + traits |= VAR_TRAIT_WRITE_FORMAT; + + if (v->width != new_width) + { + v->width = new_width; + traits |= VAR_TRAIT_WIDTH; + } + + if (print) + { + var_set_print_format_quiet (v, print); + traits |= VAR_TRAIT_PRINT_FORMAT; + } + + if (write) + { + var_set_write_format_quiet (v, write); + traits |= VAR_TRAIT_WRITE_FORMAT; + } + + if (traits != 0) + dict_var_changed (v, traits, ov); +} + +/* Changes the width of V to NEW_WIDTH. + This function should be used cautiously. */ +void +var_set_width (struct variable *v, int new_width) +{ + const int old_width = v->width; + + if (old_width == new_width) + return; - v->width = new_width; - dict_var_resized (v, old_width); - dict_var_changed (v, VAR_TRAIT_WIDTH); + var_set_width_and_formats (v, new_width, NULL, NULL); } + + + /* Returns true if variable V is numeric, false otherwise. */ bool var_is_numeric (const struct variable *v) @@ -325,8 +370,9 @@ var_set_missing_values_quiet (struct variable *v, const struct missing_values *m void var_set_missing_values (struct variable *v, const struct missing_values *miss) { + struct variable *ov = var_clone (v); var_set_missing_values_quiet (v, miss); - dict_var_changed (v, VAR_TRAIT_MISSING_VALUES); + dict_var_changed (v, VAR_TRAIT_MISSING_VALUES, ov); } /* Sets variable V to have no user-missing values. */ @@ -413,8 +459,9 @@ var_set_value_labels_quiet (struct variable *v, const struct val_labs *vls) void var_set_value_labels (struct variable *v, const struct val_labs *vls) { + struct variable *ov = var_clone (v); var_set_value_labels_quiet (v, vls); - dict_var_changed (v, VAR_TRAIT_LABEL); + dict_var_changed (v, VAR_TRAIT_LABEL, ov); } @@ -548,8 +595,9 @@ var_set_print_format_quiet (struct variable *v, const struct fmt_spec *print) void var_set_print_format (struct variable *v, const struct fmt_spec *print) { + struct variable *ov = var_clone (v); var_set_print_format_quiet (v, print); - dict_var_changed (v, VAR_TRAIT_FORMAT); + dict_var_changed (v, VAR_TRAIT_PRINT_FORMAT, ov); } /* Returns V's write format specification. */ @@ -580,8 +628,9 @@ var_set_write_format_quiet (struct variable *v, const struct fmt_spec *write) void var_set_write_format (struct variable *v, const struct fmt_spec *write) { + struct variable *ov = var_clone (v); var_set_write_format_quiet (v, write); - dict_var_changed (v, VAR_TRAIT_FORMAT); + dict_var_changed (v, VAR_TRAIT_WRITE_FORMAT, ov); } @@ -592,9 +641,10 @@ var_set_write_format (struct variable *v, const struct fmt_spec *write) void var_set_both_formats (struct variable *v, const struct fmt_spec *format) { + struct variable *ov = var_clone (v); var_set_print_format_quiet (v, format); var_set_write_format_quiet (v, format); - dict_var_changed (v, VAR_TRAIT_FORMAT); + dict_var_changed (v, VAR_TRAIT_PRINT_FORMAT | VAR_TRAIT_WRITE_FORMAT, ov); } /* Returns the default print and write format for a variable of @@ -724,9 +774,10 @@ var_set_label_quiet (struct variable *v, const char *label, bool issue_warning) bool var_set_label (struct variable *v, const char *label, bool issue_warning) { + struct variable *ov = var_clone (v); bool truncated = var_set_label_quiet (v, label, issue_warning); - dict_var_changed (v, VAR_TRAIT_LABEL); + dict_var_changed (v, VAR_TRAIT_LABEL, ov); return truncated; } @@ -775,6 +826,27 @@ measure_to_string (enum measure m) } } +/* Returns a string version of measurement level M, for use in PSPP command + syntax. */ +const char * +measure_to_syntax (enum measure m) +{ + switch (m) + { + case MEASURE_NOMINAL: + return "NOMINAL"; + + case MEASURE_ORDINAL: + return "ORDINAL"; + + case MEASURE_SCALE: + return "SCALE"; + + default: + return "Invalid"; + } +} + /* Returns V's measurement level. */ enum measure var_get_measure (const struct variable *v) @@ -795,8 +867,9 @@ var_set_measure_quiet (struct variable *v, enum measure measure) void var_set_measure (struct variable *v, enum measure measure) { + struct variable *ov = var_clone (v); var_set_measure_quiet (v, measure); - dict_var_changed (v, VAR_TRAIT_MEASURE); + dict_var_changed (v, VAR_TRAIT_MEASURE, ov); } @@ -810,6 +883,109 @@ var_default_measure (enum val_type type) return type == VAL_NUMERIC ? MEASURE_SCALE : MEASURE_NOMINAL; } +/* Returns true if M is a valid variable role, + false otherwise. */ +bool +var_role_is_valid (enum var_role role) +{ + switch (role) + { + case ROLE_NONE: + case ROLE_INPUT: + case ROLE_TARGET: + case ROLE_BOTH: + case ROLE_PARTITION: + case ROLE_SPLIT: + return true; + + default: + return false; + } +} + +/* Returns a string version of ROLE, for display to a user. */ +const char * +var_role_to_string (enum var_role role) +{ + switch (role) + { + case ROLE_INPUT: + return _("Input"); + + case ROLE_TARGET: + return _("Output"); + + case ROLE_BOTH: + return _("Both"); + + case ROLE_NONE: + return _("None"); + + case ROLE_PARTITION: + return _("Partition"); + + case ROLE_SPLIT: + return _("Split"); + + default: + return "Invalid"; + } +} + +/* Returns a string version of ROLE, for use in PSPP comamnd syntax. */ +const char * +var_role_to_syntax (enum var_role role) +{ + switch (role) + { + case ROLE_INPUT: + return "INPUT"; + + case ROLE_TARGET: + return "TARGET"; + + case ROLE_BOTH: + return "BOTH"; + + case ROLE_NONE: + return "NONE"; + + case ROLE_PARTITION: + return "PARTITION"; + + case ROLE_SPLIT: + return "SPLIT"; + + default: + return ""; + } +} + +/* Returns V's role. */ +enum var_role +var_get_role (const struct variable *v) +{ + return v->role; +} + +/* Sets V's role to ROLE. */ +static void +var_set_role_quiet (struct variable *v, enum var_role role) +{ + assert (var_role_is_valid (role)); + v->role = role; +} + + +/* Sets V's role to ROLE. */ +void +var_set_role (struct variable *v, enum var_role role) +{ + struct variable *ov = var_clone (v); + var_set_role_quiet (v, role); + dict_var_changed (v, VAR_TRAIT_ROLE, ov); +} + /* Returns V's display width, which applies only to GUIs. */ int var_get_display_width (const struct variable *v) @@ -824,15 +1000,15 @@ var_set_display_width_quiet (struct variable *v, int new_width) if (v->display_width != new_width) { v->display_width = new_width; - dict_var_display_width_changed (v); } } void var_set_display_width (struct variable *v, int new_width) { + struct variable *ov = var_clone (v); var_set_display_width_quiet (v, new_width); - dict_var_changed (v, VAR_TRAIT_DISPLAY_WIDTH); + dict_var_changed (v, VAR_TRAIT_DISPLAY_WIDTH, ov); } @@ -873,6 +1049,26 @@ alignment_to_string (enum alignment a) } } +/* Returns a string version of alignment A, for use in PSPP command syntax. */ +const char * +alignment_to_syntax (enum alignment a) +{ + switch (a) + { + case ALIGN_LEFT: + return "LEFT"; + + case ALIGN_RIGHT: + return "RIGHT"; + + case ALIGN_CENTRE: + return "CENTER"; + + default: + return "Invalid"; + } +} + /* Returns V's display alignment, which applies only to GUIs. */ enum alignment var_get_alignment (const struct variable *v) @@ -892,8 +1088,9 @@ var_set_alignment_quiet (struct variable *v, enum alignment alignment) void var_set_alignment (struct variable *v, enum alignment alignment) { + struct variable *ov = var_clone (v); var_set_alignment_quiet (v, alignment); - dict_var_changed (v, VAR_TRAIT_ALIGNMENT); + dict_var_changed (v, VAR_TRAIT_ALIGNMENT, ov); } @@ -930,8 +1127,9 @@ var_set_leave_quiet (struct variable *v, bool leave) void var_set_leave (struct variable *v, bool leave) { + struct variable *ov = var_clone (v); var_set_leave_quiet (v, leave); - dict_var_changed (v, VAR_TRAIT_LEAVE); + dict_var_changed (v, VAR_TRAIT_LEAVE, ov); } @@ -978,6 +1176,8 @@ var_get_short_name (const struct variable *var, size_t idx) void var_set_short_name (struct variable *var, size_t idx, const char *short_name) { + struct variable *ov = var_clone (var); + assert (short_name == NULL || id_is_plausible (short_name, false)); /* Clear old short name numbered IDX, if any. */ @@ -1003,7 +1203,7 @@ var_set_short_name (struct variable *var, size_t idx, const char *short_name) var->short_names[idx] = utf8_to_upper (short_name); } - dict_var_changed (var, VAR_TRAIT_NAME); + dict_var_changed (var, VAR_TRAIT_NAME, ov); } /* Clears V's short names. */ @@ -1064,8 +1264,9 @@ var_set_attributes_quiet (struct variable *v, const struct attrset *attrs) void var_set_attributes (struct variable *v, const struct attrset *attrs) { + struct variable *ov = var_clone (v); var_set_attributes_quiet (v, attrs); - dict_var_changed (v, VAR_TRAIT_ATTRIBUTES); + dict_var_changed (v, VAR_TRAIT_ATTRIBUTES, ov); } @@ -1099,6 +1300,7 @@ var_clone (const struct variable *old_var) var_set_value_labels_quiet (new_var, var_get_value_labels (old_var)); var_set_label_quiet (new_var, var_get_label (old_var), false); var_set_measure_quiet (new_var, var_get_measure (old_var)); + var_set_role_quiet (new_var, var_get_role (old_var)); var_set_display_width_quiet (new_var, var_get_display_width (old_var)); var_set_alignment_quiet (new_var, var_get_alignment (old_var)); var_set_leave_quiet (new_var, var_get_leave (old_var));