X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Fcategoricals.c;h=c088ac00732bd23dc7a9db178f058c434f1579b4;hb=12140b59f70771295af36404296219cba9f3f6bc;hp=2a0d4f85ba9e000fb1e4ac36e5d37684f4d2a389;hpb=c427bfc34eb7db7e0b489091430fe1cb373b2261;p=pspp diff --git a/src/math/categoricals.c b/src/math/categoricals.c index 2a0d4f85ba..c088ac0073 100644 --- a/src/math/categoricals.c +++ b/src/math/categoricals.c @@ -34,8 +34,6 @@ #define CATEGORICALS_DEBUG 0 -#define EFFECTS_CODING 1 - struct value_node { struct hmap_node node; /* Node in hash map. */ @@ -358,7 +356,12 @@ categoricals_update (struct categoricals *cat, const struct ccase *c) { 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); @@ -453,6 +456,9 @@ categoricals_n_total (const struct categoricals *cat) size_t categoricals_df_total (const struct categoricals *cat) { + if (NULL == cat) + return 0; + return cat->df_sum; } @@ -479,6 +485,10 @@ categoricals_done (const struct categoricals *cat_) int i; int idx_short = 0; int idx_long = 0; + + if (NULL == cat) + return; + cat->df_sum = 0; cat->n_cats_total = 0; @@ -585,7 +595,7 @@ categoricals_done (const struct categoricals *cat_) struct interaction_value *iv = iap->reverse_interaction_value_map[y]; for (x = iap->base_subscript_short; x < iap->base_subscript_short + df ;++x) { - const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \ + const double bin = categoricals_get_effects_code_for_case (cat, x, iv->ccase); iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc; } if (cat->payload && cat->payload->calculate) @@ -645,11 +655,13 @@ categoricals_get_sum_by_subscript (const struct categoricals *cat, int subscript return vp->enc_sum[subscript - vp->base_subscript_short]; } + /* Returns unity if the value in case C at SUBSCRIPT is equal to the category for that subscript */ -double +static double categoricals_get_code_for_case (const struct categoricals *cat, int subscript, - const struct ccase *c) + const struct ccase *c, + bool effects_coding) { const struct interaction *iact = categoricals_get_interaction_by_subscript (cat, subscript); @@ -682,13 +694,10 @@ categoricals_get_code_for_case (const struct categoricals *cat, int subscript, const int index = ((subscript - base_index) % iap->df_prod[v] ) / dfp; dfp = iap->df_prod [v]; -#if EFFECTS_CODING - if ( valn->index == df ) + if (effects_coding && valn->index == df ) bin = -1.0; - else -#endif - if ( valn->index != index ) - bin = 0; + else if ( valn->index != index ) + bin = 0; result *= bin; } @@ -697,6 +706,28 @@ categoricals_get_code_for_case (const struct categoricals *cat, int subscript, } +/* Returns unity if the value in case C at SUBSCRIPT is equal to the category + for that subscript */ +double +categoricals_get_dummy_code_for_case (const struct categoricals *cat, int subscript, + const struct ccase *c) +{ + return categoricals_get_code_for_case (cat, subscript, c, false); +} + +/* Returns unity if the value in case C at SUBSCRIPT is equal to the category + for that subscript. + Else if it is the last category, return -1. + Otherwise return 0. + */ +double +categoricals_get_effects_code_for_case (const struct categoricals *cat, int subscript, + const struct ccase *c) +{ + return categoricals_get_code_for_case (cat, subscript, c, true); +} + + size_t categoricals_get_n_variables (const struct categoricals *cat) {