projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
math
/
interaction.c
diff --git
a/src/math/interaction.c
b/src/math/interaction.c
index 33da8423bd7c7545a69e4c51a1d0a9a5abd4318d..7ed36f6627ed469ce1c6775efd504a191c23f338 100644
(file)
--- a/
src/math/interaction.c
+++ b/
src/math/interaction.c
@@
-38,6
+38,7
@@
#include <math/interaction.h>
#include <string.h>
#include <xalloc.h>
#include <math/interaction.h>
#include <string.h>
#include <xalloc.h>
+#include <unistr.h>
struct interaction_variable
{
struct interaction_variable
{
@@
-50,10
+51,10
@@
struct interaction_variable
struct interaction_value
{
const struct interaction_variable *intr;
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. */
};
*/
double f; /* Product of the numerical values in this interaction's value. */
};
@@
-67,13
+68,13
@@
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)
{
result = xmalloc (sizeof (*result));
result->n_alpha = 0;
result->members = xnmalloc (n_vars, sizeof (*result->members));
if (n_vars > 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++)
{
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++;
if (var_is_alpha (vars[i]))
{
result->n_alpha++;
+ width = 1;
}
}
}
}
}
}
- /*
- VAR_SET_WIDTH sets the type of the variable.
- */
- var_set_width (result->intr, MAX_SHORT_STRING * result->n_alpha + 1);
+ result->intr = var_create_internal (0, width);
return result;
}
return result;
}
@@
-102,7
+101,7
@@
void interaction_variable_destroy (struct interaction_variable *iv)
Get one of the member variables.
*/
const struct variable *
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];
}
{
return iv->members[i];
}
@@
-126,10
+125,10
@@
interaction_get_n_numeric (const struct interaction_variable *iv)
}
/*
}
/*
- Get the interaction vari
ba
le itself.
+ Get the interaction vari
ab
le itself.
*/
const struct variable *
*/
const struct variable *
-interaction_
variable_get_var
(const struct interaction_variable *iv)
+interaction_
get_variable
(const struct interaction_variable *iv)
{
return iv->intr;
}
{
return iv->intr;
}
@@
-150,18
+149,23
@@
interaction_value_create (const struct interaction_variable *var, const union va
if (var != NULL)
{
if (var != NULL)
{
+ uint8_t *val;
+ int val_width = 1;
+
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);
- result->val = value_create (n_vars * MAX_SHORT_STRING + 1);
+ value_init (&result->val, val_width);
+ val = value_str_rw (&result->val, val_width);
+ val[0] = '\0';
result->f = 1.0;
for (i = 0; i < n_vars; i++)
{
result->f = 1.0;
for (i = 0; i < n_vars; i++)
{
- member = interaction_
variable_
get_member (var, i);
+ member = interaction_get_member (var, i);
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, MAX_SHORT_STRING);
result->f = SYSMIS;
break;
}
result->f = SYSMIS;
break;
}
@@
-169,7
+173,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]))
{
- strncat (result->val->s, vals[i]->s, MAX_SHORT_STRING);
+ int w = var_get_width (var->members[i]);
+ value_resize (result, val_width, val_width + w);
+ u8_strncat (val, value_str (vals[i], w), w);
+ val = value_str_rw (&result->val, val_width);
}
else if (var_is_numeric (var->members[i]))
{
}
else if (var_is_numeric (var->members[i]))
{
@@
-192,17
+199,17
@@
interaction_value_create (const struct interaction_variable *var, const union va
avoid the error, we set result->f to 1.0 for numeric
interactions.
*/
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;
}
result->f = 1.0;
}
}
return result;
}
-union value *
+
const
union value *
interaction_value_get (const struct interaction_value *val)
{
interaction_value_get (const struct interaction_value *val)
{
- return val->val;
+ return
&
val->val;
}
/*
}
/*
@@
-224,7
+231,10
@@
interaction_value_destroy (struct interaction_value *val)
{
if (val != NULL)
{
{
if (val != NULL)
{
- free (val->val);
+ size_t n_vars = interaction_get_n_vars (val->intr);
+ int val_width = n_vars * MAX_SHORT_STRING + 1;
+
+ value_destroy (&val->val, val_width);
free (val);
}
}
free (val);
}
}
@@
-233,32
+243,22
@@
interaction_value_destroy (struct interaction_value *val)
Return a value from a variable that is an interaction.
*/
struct interaction_value *
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;
{
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;
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));
n_vars = interaction_get_n_vars (iv);
vals = xnmalloc (n_vars, sizeof (*vals));
+
for (i = 0; i < n_vars; i++)
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);
}
return interaction_value_create (iv, vals);
}
@@
-270,7
+270,7
@@
is_interaction (const struct variable *var, const struct interaction_variable **
for (i = 0; i < n_intr; i++)
{
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;
if (var_get_dict_index (intr) == var_get_dict_index (var))
{
return true;