X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Finteraction.c;h=2f8da8ccaaa1fd4619a73415a8ff888cd097d9ac;hb=fb763770be9335ecdda998155febc58b795c7bfe;hp=7fc9f0f63d2c5efee0098f06fe921d50758425e6;hpb=c2f0df181038fe9975d642096e65ea48ca491acd;p=pspp diff --git a/src/math/interaction.c b/src/math/interaction.c index 7fc9f0f63d..2f8da8ccaa 100644 --- a/src/math/interaction.c +++ b/src/math/interaction.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2010 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 @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -84,14 +85,14 @@ interaction_variable_create (const struct variable **vars, int n_vars) width += var_get_width (vars[i]); } } - result->intr = var_create_internal (0, width); + result->intr = dict_create_internal_var (0, width); } return result; } void interaction_variable_destroy (struct interaction_variable *iv) { - var_destroy (iv->intr); + dict_destroy_internal_var (iv->intr); free (iv->members); free (iv); } @@ -267,7 +268,7 @@ is_interaction (const struct variable *var, const struct interaction_variable ** for (i = 0; i < n_intr; i++) { intr = interaction_get_variable (iv[i]); - if (var_get_dict_index (intr) == var_get_dict_index (var)) + if (intr == var) { return true; }