projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some compiler warnings, which arose from recent commits.
[pspp]
/
src
/
math
/
categoricals.c
diff --git
a/src/math/categoricals.c
b/src/math/categoricals.c
index 5aeb7e213c6d564f95f424321e42a9ace4b91112..239a3a833c6dbb61dd235b7fdaf37a340c78a057 100644
(file)
--- a/
src/math/categoricals.c
+++ b/
src/math/categoricals.c
@@
-96,10
+96,10
@@
lookup_variable (const struct hmap *map, const struct variable *var, unsigned in
struct interact_params
{
struct interact_params
{
- /* A map indexed by a interaction_value */
+ /* A map
of cases
indexed by a interaction_value */
struct hmap ivmap;
struct hmap ivmap;
-
const
struct interaction *iact;
+ struct interaction *iact;
int base_subscript_short;
int base_subscript_long;
int base_subscript_short;
int base_subscript_long;
@@
-165,12
+165,17
@@
struct categoricals
struct pool *pool;
struct pool *pool;
- /* Missing values to be excluded */
- enum mv_class exclude;
+ /* Missing values in the dependent varirable to be excluded */
+ enum mv_class dep_excl;
+
+ /* Missing values in the factor variables to be excluded */
+ enum mv_class fctr_excl;
const void *aux1;
void *aux2;
const void *aux1;
void *aux2;
+ bool sane;
+
const struct payload *payload;
};
const struct payload *payload;
};
@@
-248,16
+253,15
@@
categoricals_destroy (struct categoricals *cat)
/* Interate over each interaction value, and unref any cases that we reffed */
HMAP_FOR_EACH (iv, struct interaction_value, node, &cat->iap[i].ivmap)
{
/* Interate over each interaction value, and unref any cases that we reffed */
HMAP_FOR_EACH (iv, struct interaction_value, node, &cat->iap[i].ivmap)
{
-#if 0
- if (cat->payload)
- cat->payload->destroy (cat->aux1, iv->user_data);
-#endif
+ if (cat->payload && cat->payload->destroy)
+ cat->payload->destroy (cat->aux1, cat->aux2, iv->user_data);
case_unref (iv->ccase);
}
free (cat->iap[i].enc_sum);
free (cat->iap[i].df_prod);
hmap_destroy (&cat->iap[i].ivmap);
case_unref (iv->ccase);
}
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 */
@@
-292,10
+296,15
@@
lookup_case (const struct hmap *map, const struct interaction *iact, const struc
return iv;
}
return iv;
}
+bool
+categoricals_sane (const struct categoricals *cat)
+{
+ return cat->sane;
+}
struct categoricals *
categoricals_create (struct interaction *const*inter, size_t n_inter,
struct categoricals *
categoricals_create (struct interaction *const*inter, size_t n_inter,
- const struct variable *wv, enum mv_class
exclude
)
+ const struct variable *wv, enum mv_class
dep_excl, enum mv_class fctr_excl
)
{
size_t i;
struct categoricals *cat = xmalloc (sizeof *cat);
{
size_t i;
struct categoricals *cat = xmalloc (sizeof *cat);
@@
-307,9
+316,11
@@
categoricals_create (struct interaction *const*inter, size_t n_inter,
cat->reverse_variable_map_short = NULL;
cat->reverse_variable_map_long = NULL;
cat->pool = pool_create ();
cat->reverse_variable_map_short = NULL;
cat->reverse_variable_map_long = NULL;
cat->pool = pool_create ();
- cat->exclude = exclude;
+ cat->dep_excl = dep_excl;
+ cat->fctr_excl = fctr_excl;
cat->payload = NULL;
cat->aux2 = NULL;
cat->payload = NULL;
cat->aux2 = NULL;
+ cat->sane = false;
cat->iap = pool_calloc (cat->pool, cat->n_iap, sizeof *cat->iap);
cat->iap = pool_calloc (cat->pool, cat->n_iap, sizeof *cat->iap);
@@
-347,7
+358,12
@@
categoricals_update (struct categoricals *cat, const struct ccase *c)
{
int i;
struct variable_node *vn = NULL;
{
int i;
struct variable_node *vn = NULL;
- const double weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
+ double weight;
+
+ if (NULL == cat)
+ return;
+
+ weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
assert (NULL == cat->reverse_variable_map_short);
assert (NULL == cat->reverse_variable_map_long);
assert (NULL == cat->reverse_variable_map_short);
assert (NULL == cat->reverse_variable_map_long);
@@
-378,7
+394,7
@@
categoricals_update (struct categoricals *cat, const struct ccase *c)
size_t hash;
struct interaction_value *node;
size_t hash;
struct interaction_value *node;
- if ( interaction_case_is_missing (iact, c, cat->
exclude
))
+ if ( interaction_case_is_missing (iact, c, cat->
fctr_excl
))
continue;
hash = interaction_case_hash (iact, c, 0);
continue;
hash = interaction_case_hash (iact, c, 0);
@@
-442,6
+458,9
@@
categoricals_n_total (const struct categoricals *cat)
size_t
categoricals_df_total (const struct categoricals *cat)
{
size_t
categoricals_df_total (const struct categoricals *cat)
{
+ if (NULL == cat)
+ return 0;
+
return cat->df_sum;
}
return cat->df_sum;
}
@@
-454,7
+473,7
@@
categoricals_is_complete (const struct categoricals *cat)
/* This function must be called *before* any call to categoricals_get_*_by subscript and
*after* all calls to categoricals_update */
/* This function must be called *before* any call to categoricals_get_*_by subscript and
*after* all calls to categoricals_update */
-bool
+void
categoricals_done (const struct categoricals *cat_)
{
/* Implementation Note: Whilst this function is O(n) in cat->n_cats_total, in most
categoricals_done (const struct categoricals *cat_)
{
/* Implementation Note: Whilst this function is O(n) in cat->n_cats_total, in most
@@
-468,6
+487,10
@@
categoricals_done (const struct categoricals *cat_)
int i;
int idx_short = 0;
int idx_long = 0;
int i;
int idx_short = 0;
int idx_long = 0;
+
+ if (NULL == cat)
+ return;
+
cat->df_sum = 0;
cat->n_cats_total = 0;
cat->df_sum = 0;
cat->n_cats_total = 0;
@@
-488,7
+511,10
@@
categoricals_done (const struct categoricals *cat_)
struct variable_node *vn = lookup_variable (&cat->varmap, var, hash_pointer (var, 0));
if (hmap_count (&vn->valmap) == 0)
struct variable_node *vn = lookup_variable (&cat->varmap, var, hash_pointer (var, 0));
if (hmap_count (&vn->valmap) == 0)
- return false;
+ {
+ cat->sane = false;
+ return;
+ }
cat->iap[i].df_prod[v] = df * (hmap_count (&vn->valmap) - 1);
df = cat->iap[i].df_prod[v];
cat->iap[i].df_prod[v] = df * (hmap_count (&vn->valmap) - 1);
df = cat->iap[i].df_prod[v];
@@
-528,7
+554,6
@@
categoricals_done (const struct categoricals *cat_)
HMAP_FOR_EACH (ivn, struct interaction_value, node, &iap->ivmap)
{
iap->reverse_interaction_value_map[x++] = ivn;
HMAP_FOR_EACH (ivn, struct interaction_value, node, &iap->ivmap)
{
iap->reverse_interaction_value_map[x++] = ivn;
-
}
assert (x <= iap->n_cats);
}
assert (x <= iap->n_cats);
@@
-575,12
+600,12
@@
categoricals_done (const struct categoricals *cat_)
const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
}
const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
}
- if (cat->payload && cat->payload->
destroy
)
- cat->payload->
destroy
(cat->aux1, cat->aux2, iv->user_data);
+ if (cat->payload && cat->payload->
calculate
)
+ cat->payload->
calculate
(cat->aux1, cat->aux2, iv->user_data);
}
}
}
}
-
return
true;
+
cat->sane =
true;
}
}
@@
-697,8
+722,14
@@
categoricals_get_n_variables (const struct categoricals *cat)
const struct ccase *
categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n)
{
const struct ccase *
categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n)
{
+ const struct interaction_value *vn;
+
const struct interact_params *vp = &cat->iap[iact];
const struct interact_params *vp = &cat->iap[iact];
- const struct interaction_value *vn = vp->reverse_interaction_value_map [n];
+
+ if ( n >= hmap_count (&vp->ivmap))
+ return NULL;
+
+ vn = vp->reverse_interaction_value_map [n];
return vn->ccase;
}
return vn->ccase;
}
@@
-708,7
+739,12
@@
void *
categoricals_get_user_data_by_category_real (const struct categoricals *cat, int iact, int n)
{
const struct interact_params *vp = &cat->iap[iact];
categoricals_get_user_data_by_category_real (const struct categoricals *cat, int iact, int n)
{
const struct interact_params *vp = &cat->iap[iact];
- const struct interaction_value *iv = vp->reverse_interaction_value_map [n];
+ const struct interaction_value *iv ;
+
+ if ( n >= hmap_count (&vp->ivmap))
+ return NULL;
+
+ iv = vp->reverse_interaction_value_map [n];
return iv->user_data;
}
return iv->user_data;
}