#include "case.h"
#include "casefile.h"
#include "cat.h"
+#include "cat-routines.h"
#include "command.h"
+#include "design-matrix.h"
#include "dictionary.h"
#include "error.h"
#include "file-handle.h"
run_regression (const struct casefile *cf, void *cmd_ UNUSED)
{
size_t i;
- size_t k;
size_t n_data = 0;
size_t row;
size_t case_num;
int n_indep;
int j = 0;
/*
- Keep track of the missing cases.
- */
+ Keep track of the missing cases.
+ */
int *is_missing_case;
const union value *val;
struct casereader *r;
struct casereader *r2;
struct ccase c;
- const struct variable *v;
- struct recoded_categorical_array *ca;
- struct recoded_categorical *rc;
+ struct variable *v;
+ struct variable **indep_vars;
struct design_matrix *X;
gsl_vector *Y;
pspp_linreg_cache *lcache;
Read from the active file. The first pass encodes categorical
variables and drops cases with missing values.
*/
- ca = cr_recoded_cat_ar_create (cmd.n_variables, cmd.v_variables);
- for (r = casefile_get_reader (cf);
- casereader_read (r, &c); case_destroy (&c))
+ j = 0;
+ for (i = 0; i < cmd.n_variables; i++)
{
- row = casereader_cnum (r) - 1;
- for (i = 0; i < ca->n_vars; i++)
- {
- v = (*(ca->a + i))->v;
- val = case_data (&c, v->fv);
- cr_value_update (*(ca->a + i), val);
- }
- for (i = 0; i < cmd.n_variables; i++)
+ if (!is_depvar (i))
{
v = cmd.v_variables[i];
- val = case_data (&c, v->fv);
- if (mv_is_value_missing (&v->miss, val))
+ indep_vars[j] = v;
+ j++;
+ if (v->type == ALPHA)
{
- n_data--;
- is_missing_case[row] = 1;
+ /* Make a place to hold the binary vectors
+ corresponding to this variable's values. */
+ cat_stored_values_create (v);
+ }
+ for (r = casefile_get_reader (cf);
+ casereader_read (r, &c); case_destroy (&c))
+ {
+ row = casereader_cnum (r) - 1;
+
+ val = case_data (&c, v->fv);
+ cat_value_update (v, val);
+ if (mv_is_value_missing (&v->miss, val))
+ {
+ if (!is_missing_case[row])
+ {
+ /* Now it is missing. */
+ n_data--;
+ is_missing_case[row] = 1;
+ }
+ }
}
}
}
+
Y = gsl_vector_alloc (n_data);
- cr_create_value_matrices (ca);
X =
- design_matrix_create (n_indep, (const struct variable **) cmd.v_variables,
- ca, n_data);
- lcache = pspp_linreg_cache_alloc (n_data, n_indep);
- lcache->indep_means = gsl_vector_alloc (n_indep);
- lcache->indep_std = gsl_vector_alloc (n_indep);
+ design_matrix_create (n_indep, (const struct variable **) indep_vars,
+ n_data);
+ lcache = pspp_linreg_cache_alloc (X->m->size1, X->m->size2);
+ lcache->indep_means = gsl_vector_alloc (X->m->size2);
+ lcache->indep_std = gsl_vector_alloc (X->m->size2);
/*
The second pass creates the design matrix.
case_destroy (&c))
/* Iterate over the cases. */
{
- k = 0;
case_num = casereader_cnum (r2) - 1;
if (!is_missing_case[case_num])
{
for (i = 0; i < cmd.n_variables; ++i) /* Iterate over the variables
for the current case.
- */
+ */
{
v = cmd.v_variables[i];
val = case_data (&c, v->fv);
/*
- Independent/dependent variable separation. The
- 'variables' subcommand specifies a varlist which contains
- both dependent and independent variables. The dependent
- variables are specified with the 'dependent'
- subcommand. We need to separate the two.
- */
+ Independent/dependent variable separation. The
+ 'variables' subcommand specifies a varlist which contains
+ both dependent and independent variables. The dependent
+ variables are specified with the 'dependent'
+ subcommand. We need to separate the two.
+ */
if (is_depvar (i))
{
if (v->type != NUMERIC)
{
- msg (SE, gettext ("Dependent variable must be numeric."));
+ msg (SE,
+ gettext ("Dependent variable must be numeric."));
pspp_reg_rc = CMD_FAILURE;
return;
}
- lcache->depvar = (const struct var *) v;
+ lcache->depvar = (const struct variable *) v;
gsl_vector_set (Y, row, val->f);
}
else
{
if (v->type == ALPHA)
{
- rc = cr_var_to_recoded_categorical (v, ca);
- design_matrix_set_categorical (X, row, v, val, rc);
+ design_matrix_set_categorical (X, row, v, val);
}
else if (v->type == NUMERIC)
{
design_matrix_set_numeric (X, row, v, val);
}
-
- indep_vars[k] = i;
- k++;
+
lopts.get_indep_mean_std[i] = 1;
}
}
}
}
/*
- Now that we know the number of coefficients, allocate space
- and store pointers to the variables that correspond to the
- coefficients.
+ Now that we know the number of coefficients, allocate space
+ and store pointers to the variables that correspond to the
+ coefficients.
*/
lcache->coeff = xnmalloc (X->m->size2 + 1, sizeof (*lcache->coeff));
for (i = 0; i < X->m->size2; i++)
projects / pspp / blobdiff