gsl_matrix_set (cov, cov->size1 - 1, cov->size1 - 1,
gsl_matrix_get (cm, dep_subscript, dep_subscript));
free (rows);
+ gsl_matrix_free (cm);
return result;
}
+static size_t
+get_n_all_vars (struct cmd_regression *cmd)
+{
+ size_t result = n_variables;
+ size_t i;
+ size_t j;
+ result += cmd->n_dependent;
+ for (i = 0; i < cmd->n_dependent; i++)
+ {
+ for (j = 0; j < n_variables; j++)
+ {
+ if (v_variables[j] == cmd->v_dependent[i])
+ {
+ result--;
+ }
+ }
+ }
+ return result;
+}
+static void
+fill_all_vars (const struct variable **vars, struct cmd_regression *cmd)
+{
+ size_t i;
+ size_t j;
+ bool absent;
+
+ for (i = 0; i < n_variables; i++)
+ {
+ vars[i] = v_variables[i];
+ }
+ for (i = 0; i < cmd->n_dependent; i++)
+ {
+ absent = true;
+ for (j = 0; j < n_variables; j++)
+ {
+ if (cmd->v_dependent[i] == v_variables[j])
+ {
+ absent = false;
+ break;
+ }
+ }
+ if (absent)
+ {
+ vars[i + n_variables] = cmd->v_dependent[i];
+ }
+ }
+}
static bool
run_regression (struct casereader *input, struct cmd_regression *cmd,
struct dataset *ds, linreg **models)
struct ccase *c;
struct covariance *cov;
const struct variable **vars;
+ const struct variable **all_vars;
const struct variable *dep_var;
struct casereader *reader;
const struct dictionary *dict;
- gsl_matrix *this_cm;
+ size_t n_all_vars;
assert (models != NULL);
{
dict_get_vars (dict, &v_variables, &n_variables, 0);
}
+ n_all_vars = get_n_all_vars (cmd);
+ all_vars = xnmalloc (n_all_vars, sizeof (*all_vars));
+ fill_all_vars (all_vars, cmd);
vars = xnmalloc (n_variables, sizeof (*vars));
- means = xnmalloc (n_variables, sizeof (*means));
- cov = covariance_1pass_create (n_variables, v_variables,
+ means = xnmalloc (n_all_vars, sizeof (*means));
+ cov = covariance_1pass_create (n_all_vars, all_vars,
dict_get_weight (dict), MV_ANY);
reader = casereader_clone (input);
for (k = 0; k < cmd->n_dependent; k++)
{
+ gsl_matrix *this_cm;
dep_var = cmd->v_dependent[k];
n_indep = identify_indep_vars (vars, dep_var);
this_cm = gsl_matrix_alloc (n_indep + 1, n_indep + 1);
n_data = fill_covariance (this_cm, cov, vars, n_indep,
- dep_var, v_variables, n_variables, means);
+ dep_var, all_vars, n_all_vars, means);
models[k] = linreg_alloc (dep_var, (const struct variable **) vars,
n_data, n_indep);
models[k]->depvar = dep_var;
linreg_free (models[k]);
models[k] = NULL;
}
+ gsl_matrix_free (this_cm);
}
casereader_destroy (reader);
free (vars);
+ free (all_vars);
free (means);
casereader_destroy (input);
covariance_destroy (cov);