-/* lib/linreg/coefficient.c
-
- Copyright (C) 2005 Free Software Foundation, Inc.
- Written by Jason H Stover.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02111-1307, USA.
- */
+/*
+ lib/linreg/coefficient.c
+
+ Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H Stover.
+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc., 51
+ Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
+*/
/*
Accessor functions for matching coefficients and variables.
struct varinfo
{
const struct variable *v; /* Variable associated with this
- coefficient. Note this variable may not
- be unique. In other words, a
- coefficient structure may have other
- v_info's, each with its own variable.
- */
- const union value *val; /* Value of the variable v which this
- varinfo refers to. This member is relevant
- only to categorical variables.
- */
+ coefficient. Note this variable
+ may not be unique. In other words,
+ a coefficient structure may have
+ other v_info's, each with its own
+ variable. */
+ const union value *val; /* Value of the variable v which this varinfo
+ refers to. This member is relevant only to
+ categorical variables. */
};
void
pspp_linreg_coeff_free (struct pspp_linreg_coeff *c)
{
+ free (c->v_info);
free (c);
}
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. */
- coeff = c->coeff + j;
+ c->coeff[j] = xmalloc (sizeof (*c->coeff[j]));
+ coeff = c->coeff[j];
coeff->n_vars = n_vals; /* Currently, no procedures allow
- interactions. This will have to
+ interactions. This line will have to
change when procedures that allow
- interaction terms are written.
+ interaction terms are written.
*/
coeff->v_info = xnmalloc (coeff->n_vars, sizeof (*coeff->v_info));
assert (coeff->v_info != NULL);
}
return c->estimate;
}
+
/*
Return the standard error of the estimated coefficient.
*/
-double
+double
pspp_linreg_coeff_get_std_err (const struct pspp_linreg_coeff *c)
{
if (c == NULL)
}
return c->std_err;
}
+
/*
How many variables are associated with this coefficient?
*/
}
/*
- Which variable does this coefficient match?
+ Which variable does this coefficient match? I should be
+ 0 unless the coefficient refers to an interaction term.
*/
const struct variable *
pspp_linreg_coeff_get_var (struct pspp_linreg_coeff *c, int i)
return (c->v_info + i)->v;
}
-/*
- Which value is associated with this coefficient/variable comination?
-*/
+/*
+ Which value is associated with this coefficient/variable combination?
+ */
const union value *
pspp_linreg_coeff_get_value (struct pspp_linreg_coeff *c,
const struct variable *v)
{
return NULL;
}
+ if (v->type == NUMERIC)
+ {
+ return NULL;
+ }
while (i < c->n_vars)
{
candidate = pspp_linreg_coeff_get_var (c, i);
}
return NULL;
}
+
/*
Which coefficient is associated with V? The VAL argument is relevant
only to categorical variables.
*/
const struct pspp_linreg_coeff *
-pspp_linreg_get_coeff (const pspp_linreg_cache *c,
- const struct variable *v,
- const union value *val)
+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;
- const struct variable *tmp;
+ struct pspp_linreg_coeff *result = NULL;
+ const struct variable *tmp = NULL;
if (c == NULL)
{
return NULL;
}
- if ( c->coeff == NULL || c->n_indeps == NULL || v == NULL)
+ if (c->coeff == NULL || c->n_indeps == 0 || v == NULL)
{
return NULL;
}
- result = c->coeff + i;
+
+ result = c->coeff[i];
tmp = pspp_linreg_coeff_get_var (result, 0);
while (tmp->index != v->index && i < c->n_coeffs)
{
- i++;
- result = c->coeff + i;
+ result = c->coeff[i];
tmp = pspp_linreg_coeff_get_var (result, 0);
+ i++;
}
- if (i == c->n_coeffs)
+ if (i > c->n_coeffs)
{
return NULL;
}
else if (val != NULL)
{
/*
- If v is categorical, we need to ensure the coefficient
- matches the VAL.
+ 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))/*FIX THIS*/
- {
+ while (tmp->index != v->index && i < c->n_coeffs
+ && compare_values (pspp_linreg_coeff_get_value (result, tmp),
+ val, v->width))
+ { /* FIX THIS */
i++;
- result = c->coeff + i;
+ result = c->coeff[i];
tmp = pspp_linreg_coeff_get_var (result, 0);
}
if (i == c->n_coeffs)
}
return NULL;
}
-
projects / pspp-builds.git / blobdiff