projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Avoid using \b in sed regular expressions.
[pspp]
/
src
/
math
/
categoricals.c
diff --git
a/src/math/categoricals.c
b/src/math/categoricals.c
index d0247f6d38a453cbbf7220e04f11f879a5140d65..d89dfdbb26b2c583513ff6d266ca4f2ac2e5a032 100644
(file)
--- a/
src/math/categoricals.c
+++ b/
src/math/categoricals.c
@@
-103,7
+103,7
@@
lookup_variable (const struct hmap *map, const struct variable *var, unsigned in
if (vn->var == var)
break;
if (vn->var == var)
break;
- fprintf (stderr, "
Warning: Hash table collision\n"
);
+ fprintf (stderr, "
%s:%d Warning: Hash table collision\n", __FILE__, __LINE__
);
}
return vn;
}
return vn;
@@
-115,7
+115,7
@@
struct interact_params
/* A map of cases indexed by a interaction_value */
struct hmap ivmap;
/* A map of cases indexed by a interaction_value */
struct hmap ivmap;
- struct interaction *iact;
+
const
struct interaction *iact;
int base_subscript_short;
int base_subscript_long;
int base_subscript_short;
int base_subscript_long;
@@
-270,6
+270,7
@@
categoricals_destroy (struct categoricals *cat)
int i;
if (NULL == cat)
return;
int i;
if (NULL == cat)
return;
+
for (i = 0; i < cat->n_iap; ++i)
{
struct interaction_value *iv = NULL;
for (i = 0; i < cat->n_iap; ++i)
{
struct interaction_value *iv = NULL;
@@
-284,7
+285,6
@@
categoricals_destroy (struct categoricals *cat)
free (cat->iap[i].enc_sum);
free (cat->iap[i].df_prod);
hmap_destroy (&cat->iap[i].ivmap);
free (cat->iap[i].enc_sum);
free (cat->iap[i].df_prod);
hmap_destroy (&cat->iap[i].ivmap);
- interaction_destroy (cat->iap[i].iact);
}
/* Interate over each variable and delete its value map */
}
/* Interate over each variable and delete its value map */