X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.c;h=a3078d36384208024f92379c41e5b6a3dd85344f;hb=96c27d81b9e1161537ce3591c25cb38ae9b6698e;hp=78944fca44803aabe3da896e8ac23e3f430257b0;hpb=ed38ada34331b3b1e0167c350b375a3fb38099a2;p=pspp-builds.git diff --git a/src/math/categoricals.c b/src/math/categoricals.c index 78944fca..a3078d36 100644 --- a/src/math/categoricals.c +++ b/src/math/categoricals.c @@ -17,6 +17,7 @@ #include #include "math/categoricals.h" +#include "math/interaction.h" #include @@ -33,7 +34,7 @@ struct value_node { struct hmap_node node; /* Node in hash map. */ - union value value; /* The value being labeled. */ + struct ccase *ccase; double cc; /* The total of the weights of cases with this value */ void *user_data; /* A pointer to data which the caller can store stuff */ @@ -47,7 +48,7 @@ struct var_params /* A map indexed by a union values */ struct hmap map; - const struct variable *var; + const struct interaction *iact; int base_subscript_short; int base_subscript_long; @@ -71,7 +72,7 @@ compare_value_node (const void *vn1_, const void *vn2_, const void *aux) const struct value_node * const *vn2 = vn2_; const struct var_params *vp = aux; - return value_compare_3way (&(*vn1)->value, &(*vn2)->value, var_get_width (vp->var)); + return interaction_case_cmp_3way (vp->iact, (*vn1)->ccase, (*vn2)->ccase); } @@ -80,7 +81,6 @@ struct categoricals /* The weight variable */ const struct variable *wv; - /* An array of var_params */ struct var_params *vp; @@ -125,7 +125,17 @@ categoricals_destroy ( struct categoricals *cat) if (cat != NULL) { for (i = 0 ; i < cat->n_vp; ++i) - hmap_destroy (&cat->vp[i].map); + { + struct hmap *map = &cat->vp[i].map; + struct value_node *nn; + + HMAP_FOR_EACH (nn, struct value_node, node, map) + { + case_unref (nn->ccase); + } + + hmap_destroy (map); + } pool_destroy (cat->pool); free (cat); @@ -194,28 +204,26 @@ categoricals_dump (const struct categoricals *cat) #endif - static struct value_node * -lookup_value (const struct hmap *map, const struct variable *var, const union value *val) +lookup_case (const struct hmap *map, const struct interaction *iact, const struct ccase *c) { - struct value_node *foo; - unsigned int width = var_get_width (var); - size_t hash = value_hash (val, width, 0); + struct value_node *nn; + size_t hash = interaction_case_hash (iact, c); - HMAP_FOR_EACH_WITH_HASH (foo, struct value_node, node, hash, map) + HMAP_FOR_EACH_WITH_HASH (nn, struct value_node, node, hash, map) { - if (value_equal (val, &foo->value, width)) + if (interaction_case_equal (iact, c, nn->ccase)) break; fprintf (stderr, "Warning: Hash table collision\n"); } - return foo; + return nn; } struct categoricals * -categoricals_create (const struct variable *const *v, size_t n_vars, +categoricals_create (const struct interaction **inter, size_t n_inter, const struct variable *wv, enum mv_class exclude, user_data_create_func *udf, update_func *update, void *aux1, void *aux2 @@ -224,7 +232,7 @@ categoricals_create (const struct variable *const *v, size_t n_vars, size_t i; struct categoricals *cat = xmalloc (sizeof *cat); - cat->n_vp = n_vars; + cat->n_vp = n_inter; cat->wv = wv; cat->n_cats_total = 0; cat->n_vars = 0; @@ -244,7 +252,7 @@ categoricals_create (const struct variable *const *v, size_t n_vars, for (i = 0 ; i < cat->n_vp; ++i) { hmap_init (&cat->vp[i].map); - cat->vp[i].var = v[i]; + cat->vp[i].iact = inter[i]; } return cat; @@ -264,24 +272,21 @@ categoricals_update (struct categoricals *cat, const struct ccase *c) for (i = 0 ; i < cat->n_vp; ++i) { - const struct variable *var = cat->vp[i].var; - unsigned int width = var_get_width (var); - const union value *val = case_data (c, var); + const struct interaction *iact = cat->vp[i].iact; size_t hash; struct value_node *node ; - if ( var_is_value_missing (var, val, cat->exclude)) + if ( interaction_case_is_missing (iact, c, cat->exclude)) continue; - hash = value_hash (val, width, 0); - node = lookup_value (&cat->vp[i].map, var, val); + hash = interaction_case_hash (iact, c); + node = lookup_case (&cat->vp[i].map, iact, c); if ( NULL == node) { node = pool_malloc (cat->pool, sizeof *node); - value_init (&node->value, width); - value_copy (&node->value, val, width); + node->ccase = case_ref (c); node->cc = 0.0; hmap_insert (&cat->vp[i].map, &node->node, hash); @@ -300,7 +305,7 @@ categoricals_update (struct categoricals *cat, const struct ccase *c) cat->vp[i].cc += weight; if (cat->update) - cat->update (node->user_data, cat->exclude, cat->wv, var, c, cat->aux1, cat->aux2); + cat->update (node->user_data, cat->exclude, cat->wv, NULL, c, cat->aux1, cat->aux2); } } @@ -405,18 +410,28 @@ categoricals_get_variable_by_subscript (const struct categoricals *cat, int subs { int index = reverse_variable_lookup_short (cat, subscript); - return cat->vp[index].var; + return cat->vp[index].iact->vars[0]; } -/* Return the value corresponding to SUBSCRIPT */ -static const union value * -categoricals_get_value_by_subscript (const struct categoricals *cat, int subscript) +/* Return the interaction corresponding to SUBSCRIPT */ +const struct interaction * +categoricals_get_interaction_by_subscript (const struct categoricals *cat, int subscript) +{ + int index = reverse_variable_lookup_short (cat, subscript); + + return cat->vp[index].iact; +} + + +/* Return the case corresponding to SUBSCRIPT */ +static const struct ccase * +categoricals_get_case_by_subscript (const struct categoricals *cat, int subscript) { int vindex = reverse_variable_lookup_short (cat, subscript); const struct var_params *vp = &cat->vp[vindex]; const struct value_node *vn = vp->reverse_value_map [subscript - vp->base_subscript_short]; - return &vn->value; + return vn->ccase; } @@ -446,12 +461,11 @@ double categoricals_get_binary_by_subscript (const struct categoricals *cat, int subscript, const struct ccase *c) { - const struct variable *var = categoricals_get_variable_by_subscript (cat, subscript); - int width = var_get_width (var); + const struct interaction *iact = categoricals_get_interaction_by_subscript (cat, subscript); - const union value *val = case_data (c, var); + const struct ccase *c2 = categoricals_get_case_by_subscript (cat, subscript); - return value_equal (val, categoricals_get_value_by_subscript (cat, subscript), width); + return interaction_case_equal (iact, c, c2); } @@ -462,16 +476,15 @@ categoricals_get_n_variables (const struct categoricals *cat) } - -/* Return the value corresponding to SUBSCRIPT */ -const union value * -categoricals_get_value_by_category (const struct categoricals *cat, int subscript) +/* Return a case containing the set of values corresponding to SUBSCRIPT */ +const struct ccase * +categoricals_get_case_by_category (const struct categoricals *cat, int subscript) { int vindex = reverse_variable_lookup_long (cat, subscript); const struct var_params *vp = &cat->vp[vindex]; const struct value_node *vn = vp->reverse_value_map [subscript - vp->base_subscript_long]; - return &vn->value; + return vn->ccase; }