projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch interaction-review
[pspp-builds.git]
/
src
/
math
/
interaction.c
diff --git
a/src/math/interaction.c
b/src/math/interaction.c
index cd151097d6242408c93a31dc877e4f6faffc8345..46d7e13ece35439ec7c35df74270db09e7c5cca5 100644
(file)
--- a/
src/math/interaction.c
+++ b/
src/math/interaction.c
@@
-67,10
+67,11
@@
interaction_variable_create (const struct variable **vars, int n_vars)
{
struct interaction_variable *result = NULL;
size_t i;
{
struct interaction_variable *result = NULL;
size_t i;
- int width = 0;
if (n_vars > 0)
{
if (n_vars > 0)
{
+ int width = 0;
+
result = xmalloc (sizeof (*result));
result->n_alpha = 0;
result->members = xnmalloc (n_vars, sizeof (*result->members));
result = xmalloc (sizeof (*result));
result->n_alpha = 0;
result->members = xnmalloc (n_vars, sizeof (*result->members));
@@
-81,11
+82,11
@@
interaction_variable_create (const struct variable **vars, int n_vars)
if (var_is_alpha (vars[i]))
{
result->n_alpha++;
if (var_is_alpha (vars[i]))
{
result->n_alpha++;
- width
= 1
;
+ width
+= var_get_width (vars[i])
;
}
}
}
}
+ result->intr = var_create_internal (0, width);
}
}
- result->intr = var_create_internal (0, width);
return result;
}
return result;
}
@@
-148,15
+149,16
@@
interaction_value_create (const struct interaction_variable *var, const union va
if (var != NULL)
{
if (var != NULL)
{
- int val_width =
1
;
-
uint8_t *val
;
+ int val_width =
var_get_width (interaction_get_variable (var))
;
+
int offset
;
result = xmalloc (sizeof (*result));
result->intr = var;
n_vars = interaction_get_n_vars (var);
result = xmalloc (sizeof (*result));
result->intr = var;
n_vars = interaction_get_n_vars (var);
+
value_init (&result->val, val_width);
value_init (&result->val, val_width);
- val = value_str_rw (&result->val, val_width);
-
val[0] = '\0'
;
+
+
offset = 0
;
result->f = 1.0;
for (i = 0; i < n_vars; i++)
{
result->f = 1.0;
for (i = 0; i < n_vars; i++)
{
@@
-164,7
+166,7
@@
interaction_value_create (const struct interaction_variable *var, const union va
if (var_is_value_missing (member, vals[i], MV_ANY))
{
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;
}
result->f = SYSMIS;
break;
}
@@
-172,10
+174,10
@@
interaction_value_create (const struct interaction_variable *var, const union va
{
if (var_is_alpha (var->members[i]))
{
{
if (var_is_alpha (var->members[i]))
{
+ char *val = value_str_rw (&result->val, val_width);
int w = var_get_width (var->members[i]);
int w = var_get_width (var->members[i]);
- value_resize (result, val_width, val_width + w);
- strncat (val, value_str (vals[i], w), w);
- val = value_str_rw (&result->val, val_width);
+ memcpy (val + offset, value_str (vals[i], w), w);
+ offset += w;
}
else if (var_is_numeric (var->members[i]))
{
}
else if (var_is_numeric (var->members[i]))
{
@@
-214,7
+216,7
@@
interaction_value_get (const struct interaction_value *val)
/*
Returns the numeric value of the non-zero entry for the vector
corresponding to this interaction. Do not use this function to get
/*
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 pur
le
y numeric interaction. Instead, use the
+ the numeric value of a pur
el
y numeric interaction. Instead, use the
union value * returned by interaction_value_get.
*/
double
union value * returned by interaction_value_get.
*/
double
@@
-230,8
+232,7
@@
interaction_value_destroy (struct interaction_value *val)
{
if (val != NULL)
{
{
if (val != NULL)
{
- size_t n_vars = interaction_get_n_vars (val->intr);
- int val_width = n_vars * MAX_SHORT_STRING + 1;
+ int val_width = var_get_width (interaction_get_variable (val->intr));
value_destroy (&val->val, val_width);
free (val);
value_destroy (&val->val, val_width);
free (val);
@@
-246,12
+247,10
@@
interaction_case_data (const struct ccase *ccase, const struct interaction_varia
{
size_t i;
size_t n_vars;
{
size_t i;
size_t n_vars;
- const struct variable *intr;
const struct variable *member;
const union value **vals = NULL;
n_vars = interaction_get_n_vars (iv);
const struct variable *member;
const union value **vals = NULL;
n_vars = interaction_get_n_vars (iv);
- intr = interaction_get_variable (iv);
vals = xnmalloc (n_vars, sizeof (*vals));
for (i = 0; i < n_vars; i++)
vals = xnmalloc (n_vars, sizeof (*vals));
for (i = 0; i < n_vars; i++)