#include <libpspp/message.h>
#include <data/variable.h>
#include <data/category.h>
+#include <data/value.h>
#include <gsl/gsl_machine.h>
#include <gsl/gsl_vector.h>
(dm->vars + i)->v = v; /* Allows us to look up the variable from
the design matrix. */
(dm->vars + i)->first_column = n_cols;
- if (v->type == NUMERIC)
+ if (var_is_numeric (v))
{
(dm->vars + i)->last_column = n_cols;
n_cols++;
}
- else if (v->type == ALPHA)
+ else if (var_is_alpha (v))
{
- assert (v->obs_vals != NULL);
+ struct cat_vals *obs_vals = var_get_obs_vals (v);
(dm->vars + i)->last_column =
- (dm->vars + i)->first_column + v->obs_vals->n_categories - 2;
- n_cols += v->obs_vals->n_categories - 1;
+ (dm->vars + i)->first_column + obs_vals->n_categories - 2;
+ n_cols += obs_vals->n_categories - 1;
}
}
dm->m = gsl_matrix_calloc (n_data, n_cols);
Return the index of the variable for the
given column.
*/
-static size_t
-design_matrix_col_to_var_index (const struct design_matrix *dm, size_t col)
+struct variable *
+design_matrix_col_to_var (const struct design_matrix *dm, size_t col)
{
size_t i;
struct design_matrix_var v;
{
v = dm->vars[i];
if (v.first_column <= col && col <= v.last_column)
- return (v.v)->index;
- }
- return DM_INDEX_NOT_FOUND;
-}
-
-/*
- Return a pointer to the variable whose values
- are stored in column col.
- */
-struct variable *
-design_matrix_col_to_var (const struct design_matrix *dm, size_t col)
-{
- size_t index;
- size_t i;
- struct design_matrix_var dmv;
-
- index = design_matrix_col_to_var_index (dm, col);
- for (i = 0; i < dm->n_vars; i++)
- {
- dmv = dm->vars[i];
- if ((dmv.v)->index == index)
- {
- return (struct variable *) dmv.v;
- }
+ return (struct variable *) v.v;
}
return NULL;
}
-static size_t
-cmp_dm_var_index (const struct design_matrix_var *dmv, size_t index)
-{
- if (dmv->v->index == index)
- return 1;
- return 0;
-}
-
/*
Return the number of the first column which holds the
values for variable v.
for (i = 0; i < dm->n_vars; i++)
{
tmp = dm->vars[i];
- if (cmp_dm_var_index (&tmp, v->index))
+ if (tmp.v == v)
{
return tmp.first_column;
}
for (i = 0; i < dm->n_vars; i++)
{
tmp = dm->vars[i];
- if (cmp_dm_var_index (&tmp, v->index))
+ if (tmp.v == v)
{
return tmp.last_column;
}
size_t lc;
double entry;
- assert (var->type == ALPHA);
+ assert (var_is_alpha (var));
fc = design_matrix_var_to_column (dm, var);
lc = dm_var_to_last_column (dm, var);
assert (lc != DM_COLUMN_NOT_FOUND);
{
size_t col;
- assert (var->type == NUMERIC);
+ assert (var_is_numeric (var));
col = design_matrix_var_to_column ((const struct design_matrix *) dm, var);
assert (col != DM_COLUMN_NOT_FOUND);
gsl_matrix_set (dm->m, row, col, val->f);