X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcoefficient.c;h=fe0cd43877f3ab57c71f95b8a4b43d30b63098ee;hb=11d2ffde279bad43d0c271f7fbfad383969e063f;hp=f5d0eb56a52697b52f9e735fc1287ddc5fc994da;hpb=c21a0f82e238fe80b61d8ab00e21ec32c753ca2f;p=pspp-builds.git diff --git a/src/math/coefficient.c b/src/math/coefficient.c index f5d0eb56..fe0cd438 100644 --- a/src/math/coefficient.c +++ b/src/math/coefficient.c @@ -1,5 +1,5 @@ /* - lib/linreg/coefficient.c + src/math/coefficient.c Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H Stover. @@ -21,6 +21,7 @@ /* Accessor functions for matching coefficients and variables. */ +#include #include #include #include "src/math/design-matrix.h" @@ -42,7 +43,7 @@ struct varinfo }; void -pspp_linreg_coeff_free (struct pspp_linreg_coeff *c) +pspp_coeff_free (struct pspp_coeff *c) { free (c->v_info); free (c); @@ -53,50 +54,43 @@ pspp_linreg_coeff_free (struct pspp_linreg_coeff *c) coefficient structures for the linear model. */ void -pspp_linreg_coeff_init (pspp_linreg_cache * c, struct design_matrix *X) +pspp_coeff_init (struct pspp_coeff ** c, const struct design_matrix *X) { size_t i; - size_t j; int n_vals = 1; - struct pspp_linreg_coeff *coeff; - c->coeff = xnmalloc (X->m->size2 + 1, sizeof (*c->coeff)); - c->coeff[0] = xmalloc (sizeof (*c->coeff[0])); - c->coeff[0]->v_info = NULL; /* Intercept has no associated variable. */ for (i = 0; i < X->m->size2; i++) { - j = i + 1; /* The first coefficient is the intercept. */ - c->coeff[j] = xmalloc (sizeof (*c->coeff[j])); - coeff = c->coeff[j]; - coeff->n_vars = n_vals; /* Currently, no procedures allow + c[i] = xmalloc (sizeof (*c[i])); + c[i]->n_vars = n_vals; /* Currently, no procedures allow interactions. This line will have to change when procedures that allow interaction terms are written. */ - coeff->v_info = xnmalloc (coeff->n_vars, sizeof (*coeff->v_info)); - assert (coeff->v_info != NULL); - coeff->v_info->v = + c[i]->v_info = xnmalloc (c[i]->n_vars, sizeof (*c[i]->v_info)); + assert (c[i]->v_info != NULL); + c[i]->v_info->v = (const struct variable *) design_matrix_col_to_var (X, i); - if (coeff->v_info->v->type == ALPHA) + if (var_is_alpha (c[i]->v_info->v)) { size_t k; - k = design_matrix_var_to_column (X, coeff->v_info->v); + k = design_matrix_var_to_column (X, c[i]->v_info->v); assert (k <= i); k = i - k; - coeff->v_info->val = - cat_subscript_to_value (k, (struct variable *) coeff->v_info->v); + c[i]->v_info->val = + cat_subscript_to_value (k, (struct variable *) c[i]->v_info->v); } } } void -pspp_linreg_coeff_set_estimate (struct pspp_linreg_coeff *c, double estimate) +pspp_coeff_set_estimate (struct pspp_coeff *c, double estimate) { c->estimate = estimate; } void -pspp_linreg_coeff_set_std_err (struct pspp_linreg_coeff *c, double std_err) +pspp_coeff_set_std_err (struct pspp_coeff *c, double std_err) { c->std_err = std_err; } @@ -105,7 +99,7 @@ pspp_linreg_coeff_set_std_err (struct pspp_linreg_coeff *c, double std_err) Return the estimated value of the coefficient. */ double -pspp_linreg_coeff_get_est (const struct pspp_linreg_coeff *c) +pspp_coeff_get_est (const struct pspp_coeff *c) { if (c == NULL) { @@ -118,7 +112,7 @@ pspp_linreg_coeff_get_est (const struct pspp_linreg_coeff *c) Return the standard error of the estimated coefficient. */ double -pspp_linreg_coeff_get_std_err (const struct pspp_linreg_coeff *c) +pspp_coeff_get_std_err (const struct pspp_coeff *c) { if (c == NULL) { @@ -131,7 +125,7 @@ pspp_linreg_coeff_get_std_err (const struct pspp_linreg_coeff *c) How many variables are associated with this coefficient? */ int -pspp_linreg_coeff_get_n_vars (struct pspp_linreg_coeff *c) +pspp_coeff_get_n_vars (struct pspp_coeff *c) { if (c == NULL) { @@ -145,7 +139,7 @@ pspp_linreg_coeff_get_n_vars (struct pspp_linreg_coeff *c) 0 unless the coefficient refers to an interaction term. */ const struct variable * -pspp_linreg_coeff_get_var (struct pspp_linreg_coeff *c, int i) +pspp_coeff_get_var (struct pspp_coeff *c, int i) { if (c == NULL) { @@ -159,7 +153,7 @@ pspp_linreg_coeff_get_var (struct pspp_linreg_coeff *c, int i) Which value is associated with this coefficient/variable combination? */ const union value * -pspp_linreg_coeff_get_value (struct pspp_linreg_coeff *c, +pspp_coeff_get_value (struct pspp_coeff *c, const struct variable *v) { int i = 0; @@ -169,14 +163,14 @@ pspp_linreg_coeff_get_value (struct pspp_linreg_coeff *c, { return NULL; } - if (v->type == NUMERIC) + if (var_is_numeric (v)) { return NULL; } while (i < c->n_vars) { - candidate = pspp_linreg_coeff_get_var (c, i); - if (v->index == candidate->index) + candidate = pspp_coeff_get_var (c, i); + if (v == candidate) { return (c->v_info + i)->val; } @@ -189,12 +183,12 @@ pspp_linreg_coeff_get_value (struct pspp_linreg_coeff *c, Which coefficient is associated with V? The VAL argument is relevant only to categorical variables. */ -const struct pspp_linreg_coeff * +const struct pspp_coeff * pspp_linreg_get_coeff (const pspp_linreg_cache * c, const struct variable *v, const union value *val) { int i = 1; - struct pspp_linreg_coeff *result = NULL; + struct pspp_coeff *result = NULL; const struct variable *tmp = NULL; if (c == NULL) @@ -207,18 +201,18 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c, } result = c->coeff[i]; - tmp = pspp_linreg_coeff_get_var (result, 0); - while (tmp->index != v->index && i < c->n_coeffs) + tmp = pspp_coeff_get_var (result, 0); + while (tmp != v && i < c->n_coeffs) { result = c->coeff[i]; - tmp = pspp_linreg_coeff_get_var (result, 0); + tmp = pspp_coeff_get_var (result, 0); i++; } if (i > c->n_coeffs) { return NULL; } - if (v->type == NUMERIC) + if (var_is_numeric (v)) { return result; } @@ -228,13 +222,13 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c, If v is categorical, we need to ensure the coefficient matches the VAL. */ - while (tmp->index != v->index && i < c->n_coeffs - && compare_values (pspp_linreg_coeff_get_value (result, tmp), - val, v->width)) + while (tmp != v && i < c->n_coeffs + && compare_values (pspp_coeff_get_value (result, tmp), + val, var_get_width (v))) { /* FIX THIS */ i++; result = c->coeff[i]; - tmp = pspp_linreg_coeff_get_var (result, 0); + tmp = pspp_coeff_get_var (result, 0); } if (i == c->n_coeffs) {