From 77fdb545bd614eaf71a934485fca8e5627cf0324 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 23 Dec 2018 09:07:08 -0800 Subject: [PATCH] categoricals: Remove 'dep_excl' parameter. It was not used for anything. --- src/language/stats/examine.c | 3 +-- src/language/stats/glm.c | 2 +- src/language/stats/logistic.c | 2 +- src/language/stats/means.c | 2 +- src/language/stats/oneway.c | 2 +- src/math/categoricals.c | 6 +----- src/math/categoricals.h | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c index b8c518c60b..861f81f2d2 100644 --- a/src/language/stats/examine.c +++ b/src/language/stats/examine.c @@ -1829,8 +1829,7 @@ run_examine (struct examine *cmd, struct casereader *input) cmd->wv = dict_get_weight (cmd->dict); cmd->cats - = categoricals_create (cmd->iacts, cmd->n_iacts, - cmd->wv, cmd->dep_excl, cmd->fctr_excl); + = categoricals_create (cmd->iacts, cmd->n_iacts, cmd->wv, cmd->fctr_excl); categoricals_set_payload (cmd->cats, &payload, cmd, NULL); diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c index 74e918b886..5c46b18437 100644 --- a/src/language/stats/glm.c +++ b/src/language/stats/glm.c @@ -598,7 +598,7 @@ run_glm (struct glm_spec *cmd, struct casereader *input, NULL, NULL); ws.cats = categoricals_create (cmd->interactions, cmd->n_interactions, - cmd->wv, cmd->exclude, MV_ANY); + cmd->wv, MV_ANY); cov = covariance_2pass_create (cmd->n_dep_vars, cmd->dep_vars, ws.cats, cmd->wv, cmd->exclude, true); diff --git a/src/language/stats/logistic.c b/src/language/stats/logistic.c index 4ab3f6f6db..14c317ff72 100644 --- a/src/language/stats/logistic.c +++ b/src/language/stats/logistic.c @@ -464,7 +464,7 @@ initial_pass (const struct lr_spec *cmd, struct lr_result *res, struct casereade res->cp.destroy = frq_destroy; res->cats = categoricals_create (cmd->cat_predictors, cmd->n_cat_predictors, - cmd->wv, cmd->exclude, MV_ANY); + cmd->wv, MV_ANY); categoricals_set_payload (res->cats, &res->cp, cmd, res); } diff --git a/src/language/stats/means.c b/src/language/stats/means.c index 8fa1ba81cd..df747fb5d0 100644 --- a/src/language/stats/means.c +++ b/src/language/stats/means.c @@ -981,7 +981,7 @@ run_means (struct means *cmd, struct casereader *input, struct mtable *table = &cmd->table[t]; table->cats = categoricals_create (table->interactions, - table->n_layers, wv, cmd->dep_exclude, cmd->exclude); + table->n_layers, wv, cmd->exclude); categoricals_set_payload (table->cats, &payload, cmd, table); } diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c index da24cb6625..d0a6e5d786 100644 --- a/src/language/stats/oneway.c +++ b/src/language/stats/oneway.c @@ -721,7 +721,7 @@ run_oneway (const struct oneway_spec *cmd, ws.vws[v].iact = interaction_create (cmd->indep_var); ws.vws[v].cat = categoricals_create (&ws.vws[v].iact, 1, cmd->wv, - cmd->exclude, cmd->exclude); + cmd->exclude); categoricals_set_payload (ws.vws[v].cat, &payload, CONST_CAST (struct variable *, cmd->vars[v]), diff --git a/src/math/categoricals.c b/src/math/categoricals.c index e1bbe1f99b..d2b5c322b0 100644 --- a/src/math/categoricals.c +++ b/src/math/categoricals.c @@ -182,9 +182,6 @@ struct categoricals struct pool *pool; - /* 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; @@ -353,7 +350,7 @@ categoricals_sane (const struct categoricals *cat) struct categoricals * categoricals_create (struct interaction *const*inter, size_t n_inter, - const struct variable *wv, enum mv_class dep_excl, enum mv_class fctr_excl) + const struct variable *wv, enum mv_class fctr_excl) { size_t i; struct categoricals *cat = xmalloc (sizeof *cat); @@ -365,7 +362,6 @@ 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->dep_excl = dep_excl; cat->fctr_excl = fctr_excl; cat->payload = NULL; cat->aux2 = NULL; diff --git a/src/math/categoricals.h b/src/math/categoricals.h index adb169cc23..4d7d4959a5 100644 --- a/src/math/categoricals.h +++ b/src/math/categoricals.h @@ -29,7 +29,7 @@ struct interaction; union value ; struct categoricals *categoricals_create (struct interaction *const*, size_t n_int, - const struct variable *wv, enum mv_class dep_excl, + const struct variable *wv, enum mv_class fctr_excl); void categoricals_destroy (struct categoricals *); -- 2.30.2