projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatically infer variables' measurement level from format and data.
[pspp]
/
src
/
data
/
variable.h
diff --git
a/src/data/variable.h
b/src/data/variable.h
index 2fa68667869d23c2f479c46b51d4b2b1e6954693..b5562ba827c5ca538b1bc3590b52f15113877fd1 100644
(file)
--- a/
src/data/variable.h
+++ b/
src/data/variable.h
@@
-127,9
+127,10
@@
bool var_has_label (const struct variable *);
/* How data is measured. */
enum measure
{
/* How data is measured. */
enum measure
{
- MEASURE_NOMINAL = 0,
- MEASURE_ORDINAL = 1,
- MEASURE_SCALE = 2,
+ MEASURE_UNKNOWN = 0,
+ MEASURE_NOMINAL = 1,
+ MEASURE_ORDINAL = 2,
+ MEASURE_SCALE = 3,
n_MEASURES
};
n_MEASURES
};
@@
-140,7
+141,8
@@
const char *measure_to_syntax (enum measure);
enum measure var_get_measure (const struct variable *);
void var_set_measure (struct variable *, enum measure);
enum measure var_get_measure (const struct variable *);
void var_set_measure (struct variable *, enum measure);
-enum measure var_default_measure (enum val_type);
+enum measure var_default_measure_for_type (enum val_type);
+enum measure var_default_measure_for_format (enum fmt_type);
/* Intended usage of a variable, for populating dialogs. */
enum var_role
/* Intended usage of a variable, for populating dialogs. */
enum var_role