-/*
- src/math/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.
-*/
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2005 Free Software Foundation, Inc.
+
+ 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 3 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, see <http://www.gnu.org/licenses/>. */
/*
Accessor functions for matching coefficients and variables.
*/
+#include <config.h>
#include <math/coefficient.h>
#include <math/linreg/linreg.h>
#include "src/math/design-matrix.h"
size_t i;
int n_vals = 1;
+ assert (c != NULL);
for (i = 0; i < X->m->size2; i++)
{
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.
+ interaction terms are written.
*/
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);
+ c[i]->v_info->v = design_matrix_col_to_var (X, i);
if (var_is_alpha (c[i]->v_info->v))
{
assert (k <= i);
k = i - k;
c[i]->v_info->val =
- cat_subscript_to_value (k, (struct variable *) c[i]->v_info->v);
+ cat_subscript_to_value (k, c[i]->v_info->v);
}
}
}
while (i < c->n_vars)
{
candidate = pspp_coeff_get_var (c, i);
- if (v->index == candidate->index)
+ if (v == candidate)
{
return (c->v_info + i)->val;
}
pspp_linreg_get_coeff (const pspp_linreg_cache * c,
const struct variable *v, const union value *val)
{
- int i = 1;
+ int i;
struct pspp_coeff *result = NULL;
const struct variable *tmp = NULL;
{
return NULL;
}
-
+ /*
+ C->N_COEFFS == 1 means regression through the origin.
+ */
+ i = (c->n_coeffs > 1) ? 1 : 0;
result = c->coeff[i];
tmp = pspp_coeff_get_var (result, 0);
- while (tmp->index != v->index && i < c->n_coeffs)
+ while (tmp != v && i < c->n_coeffs)
{
result = c->coeff[i];
tmp = pspp_coeff_get_var (result, 0);
i++;
}
- if (i > c->n_coeffs)
+ if (i >= c->n_coeffs)
{
return NULL;
}
If v is categorical, we need to ensure the coefficient
matches the VAL.
*/
- while (tmp->index != v->index && i < c->n_coeffs
+ while (tmp != v && i < c->n_coeffs
&& compare_values (pspp_coeff_get_value (result, tmp),
val, var_get_width (v)))
{ /* FIX THIS */