/* PSPP - a program for statistical analysis.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011 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
*/
#include <config.h>
+
+#include "math/interaction.h"
+
#include <assert.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <gl/unistr.h>
-#include <math/interaction.h>
#include <string.h>
-#include <xalloc.h>
+#include <unistr.h>
+
+#include "data/dictionary.h"
+#include "data/value.h"
+#include "data/variable.h"
+
+#include "gl/xalloc.h"
struct interaction_variable
{
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);
}
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;
}