X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Finteraction.c;h=f2831d27680d26033965a756c0aebf5c808fd177;hb=8e16ce856374ec440157b80ac19ef6dd724a0bd1;hp=33da8423bd7c7545a69e4c51a1d0a9a5abd4318d;hpb=deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416;p=pspp-builds.git diff --git a/src/math/interaction.c b/src/math/interaction.c index 33da8423..f2831d27 100644 --- a/src/math/interaction.c +++ b/src/math/interaction.c @@ -50,10 +50,10 @@ struct interaction_variable struct interaction_value { const struct interaction_variable *intr; - union value *val; /* Concatenation of the string values in this - interaction's value, or the product of a bunch - of numeric values for a purely numeric - interaction. + union value val; /* Concatenation of the string values in this + interaction's value, or the product of a bunch + of numeric values for a purely numeric + interaction. */ double f; /* Product of the numerical values in this interaction's value. */ }; @@ -70,10 +70,11 @@ interaction_variable_create (const struct variable **vars, int n_vars) if (n_vars > 0) { + int width = 0; + result = xmalloc (sizeof (*result)); result->n_alpha = 0; result->members = xnmalloc (n_vars, sizeof (*result->members)); - result->intr = var_create_internal (0); result->n_vars = n_vars; for (i = 0; i < n_vars; i++) { @@ -81,13 +82,11 @@ interaction_variable_create (const struct variable **vars, int n_vars) if (var_is_alpha (vars[i])) { result->n_alpha++; + width += var_get_width (vars[i]); } } + result->intr = var_create_internal (0, width); } - /* - VAR_SET_WIDTH sets the type of the variable. - */ - var_set_width (result->intr, MAX_SHORT_STRING * result->n_alpha + 1); return result; } @@ -102,7 +101,7 @@ void interaction_variable_destroy (struct interaction_variable *iv) Get one of the member variables. */ const struct variable * -interaction_variable_get_member (const struct interaction_variable *iv, size_t i) +interaction_get_member (const struct interaction_variable *iv, size_t i) { return iv->members[i]; } @@ -126,10 +125,10 @@ interaction_get_n_numeric (const struct interaction_variable *iv) } /* - Get the interaction varibale itself. + Get the interaction variable itself. */ const struct variable * -interaction_variable_get_var (const struct interaction_variable *iv) +interaction_get_variable (const struct interaction_variable *iv) { return iv->intr; } @@ -144,24 +143,27 @@ struct interaction_value * interaction_value_create (const struct interaction_variable *var, const union value **vals) { struct interaction_value *result = NULL; - const struct variable *member; - size_t i; - size_t n_vars; if (var != NULL) { + size_t i; + int val_width = var_get_width (interaction_get_variable (var)); + int offset = 0; + size_t n_vars = interaction_get_n_vars (var); + result = xmalloc (sizeof (*result)); result->intr = var; - n_vars = interaction_get_n_vars (var); - result->val = value_create (n_vars * MAX_SHORT_STRING + 1); + + value_init (&result->val, val_width); + result->f = 1.0; for (i = 0; i < n_vars; i++) { - member = interaction_variable_get_member (var, i); + const struct variable *member = interaction_get_member (var, i); if (var_is_value_missing (member, vals[i], MV_ANY)) { - value_set_missing (result->val, MAX_SHORT_STRING); + value_set_missing (&result->val, val_width); result->f = SYSMIS; break; } @@ -169,7 +171,10 @@ interaction_value_create (const struct interaction_variable *var, const union va { if (var_is_alpha (var->members[i])) { - strncat (result->val->s, vals[i]->s, MAX_SHORT_STRING); + uint8_t *val = value_str_rw (&result->val, val_width); + int w = var_get_width (var->members[i]); + u8_cpy (val + offset, value_str (vals[i], w), w); + offset += w; } else if (var_is_numeric (var->members[i])) { @@ -192,23 +197,23 @@ interaction_value_create (const struct interaction_variable *var, const union va avoid the error, we set result->f to 1.0 for numeric interactions. */ - result->val->f = result->f; + result->val.f = result->f; result->f = 1.0; } } return result; } -union value * +const union value * interaction_value_get (const struct interaction_value *val) { - return val->val; + return &val->val; } /* Returns the numeric value of the non-zero entry for the vector corresponding to this interaction. Do not use this function to get - the numeric value of a purley numeric interaction. Instead, use the + the numeric value of a purely numeric interaction. Instead, use the union value * returned by interaction_value_get. */ double @@ -224,7 +229,9 @@ interaction_value_destroy (struct interaction_value *val) { if (val != NULL) { - free (val->val); + int val_width = var_get_width (interaction_get_variable (val->intr)); + + value_destroy (&val->val, val_width); free (val); } } @@ -233,32 +240,22 @@ interaction_value_destroy (struct interaction_value *val) Return a value from a variable that is an interaction. */ struct interaction_value * -interaction_case_data (const struct ccase *ccase, const struct variable *var, - const struct interaction_variable **intr_vars, size_t n_intr) +interaction_case_data (const struct ccase *ccase, const struct interaction_variable *iv) { size_t i; size_t n_vars; - const struct interaction_variable *iv; - const struct variable *intr; const struct variable *member; const union value **vals = NULL; - for (i = 0; i < n_intr; i++) - { - iv = intr_vars[i]; - intr = interaction_variable_get_var (iv); - if (var_get_dict_index (intr) == var_get_dict_index (var)) - { - break; - } - } n_vars = interaction_get_n_vars (iv); vals = xnmalloc (n_vars, sizeof (*vals)); + for (i = 0; i < n_vars; i++) - { - member = interaction_variable_get_member (iv, i); - vals[i] = case_data (ccase, member); - } + { + member = interaction_get_member (iv, i); + vals[i] = case_data (ccase, member); + } + return interaction_value_create (iv, vals); } @@ -270,7 +267,7 @@ is_interaction (const struct variable *var, const struct interaction_variable ** for (i = 0; i < n_intr; i++) { - intr = interaction_variable_get_var (iv[i]); + intr = interaction_get_variable (iv[i]); if (var_get_dict_index (intr) == var_get_dict_index (var)) { return true;