projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
math
/
interaction.c
diff --git
a/src/math/interaction.c
b/src/math/interaction.c
index 7fc9f0f63d2c5efee0098f06fe921d50758425e6..87f4836da23479ced8fa9a2069841ada800408d9 100644
(file)
--- a/
src/math/interaction.c
+++ b/
src/math/interaction.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-30,13
+30,18
@@
*/
#include <config.h>
*/
#include <config.h>
+
+#include "math/interaction.h"
+
#include <assert.h>
#include <assert.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <gl/unistr.h>
-#include <math/interaction.h>
#include <string.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
{
struct interaction_variable
{
@@
-84,14
+89,14
@@
interaction_variable_create (const struct variable **vars, int n_vars)
width += var_get_width (vars[i]);
}
}
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)
{
}
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);
}
free (iv->members);
free (iv);
}
@@
-267,7
+272,7
@@
is_interaction (const struct variable *var, const struct interaction_variable **
for (i = 0; i < n_intr; i++)
{
intr = interaction_get_variable (iv[i]);
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;
}
{
return true;
}