X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcat.c;h=6543600ad26067aa20d7ee2b0f7e1b9ec2c0c6d6;hb=db5df54124af56dc1dfce71f839d78da2b49e346;hp=934a4d31c9d50a8f3cbc74e8155d4af6a3e1d4ec;hpb=494a50b0d023c55b61caf33e3887379332166d07;p=pspp diff --git a/src/cat.c b/src/cat.c index 934a4d31c9..6543600ad2 100644 --- a/src/cat.c +++ b/src/cat.c @@ -53,8 +53,8 @@ #define CR_VALUE_NOT_FOUND -2 #define CR_INDEX_NOT_FOUND -3 -static gsl_vector_const_view cr_value_to_vector (const union value *, - struct recoded_categorical *); +static gsl_vector_view cr_value_to_vector (const union value *, + struct recoded_categorical *); struct recoded_categorical * cr_recoded_categorical_create (const struct variable *v) @@ -65,8 +65,7 @@ cr_recoded_categorical_create (const struct variable *v) rc->v = v; rc->n_categories = 0; rc->n_allocated_categories = N_INITIAL_CATEGORIES; - rc->vals = (union value **) xmalloc (N_INITIAL_CATEGORIES * - sizeof (*rc->vals)); + rc->vals = xnmalloc (N_INITIAL_CATEGORIES, sizeof *rc->vals); return rc; } @@ -86,7 +85,7 @@ cr_recoded_cat_ar_create (int n_variables, struct variable *v_variables[]) struct recoded_categorical_array *ca; struct variable *v; - ca = (struct recoded_categorical_array *) xmalloc (sizeof (*ca)); + ca = xmalloc (sizeof *ca); for (i = 0; i < n_variables; i++) { v = v_variables[i]; @@ -96,7 +95,7 @@ cr_recoded_cat_ar_create (int n_variables, struct variable *v_variables[]) } } ca->n_vars = n_categoricals; - ca->a = xmalloc (n_categoricals * sizeof (*(ca->a))); + ca->a = xnmalloc (n_categoricals, sizeof *ca->a); for (i = 0; i < n_categoricals; i++) { *(ca->a + i) = cr_recoded_categorical_create (v_variables[i]); @@ -126,7 +125,7 @@ cr_value_find (struct recoded_categorical *rc, const union value *v) for (i = 0; i < rc->n_categories; i++) { - val = *(rc->vals + i); + val = rc->vals + i; if (!compare_values (val, v, rc->v->width)) { return i; @@ -146,11 +145,10 @@ cr_value_update (struct recoded_categorical *rc, const union value *v) if (rc->n_categories >= rc->n_allocated_categories) { rc->n_allocated_categories *= 2; - rc->vals = (union value **) - xrealloc (rc->vals, rc->n_allocated_categories - * sizeof (*(rc->vals))); + rc->vals = xnrealloc (rc->vals, + rc->n_allocated_categories, sizeof *rc->vals); } - *(rc->vals + rc->n_categories) = v; + rc->vals[rc->n_categories] = *v; rc->n_categories++; } } @@ -193,7 +191,7 @@ cr_value_to_subscript (const union value *val, struct recoded_categorical *cr) subscript = cr->n_categories - 1; while (subscript > 0) { - v = *(cr->vals + subscript); + v = cr->vals + subscript; different = compare_values (val, v, cr->v->width); if (!different) { @@ -204,12 +202,12 @@ cr_value_to_subscript (const union value *val, struct recoded_categorical *cr) return subscript; } -static const union value * +static union value * cr_subscript_to_value (const size_t s, struct recoded_categorical *cr) { if (s < cr->n_categories) { - return cr->vals[s]; + return (cr->vals + s); } else { @@ -221,12 +219,12 @@ cr_subscript_to_value (const size_t s, struct recoded_categorical *cr) Return the row of the matrix corresponding to the value v. */ -static gsl_vector_const_view -cr_value_to_vector (const union value * v, struct recoded_categorical * cr) +static gsl_vector_view +cr_value_to_vector (const union value *v, struct recoded_categorical *cr) { size_t row; row = cr_value_to_subscript (v, cr); - return gsl_matrix_const_row (cr->m, row); + return gsl_matrix_row (cr->m, row); } /* @@ -268,7 +266,7 @@ cr_is_zero_vector (const gsl_vector * vec) when i is between 1 and cr->n_categories - 1 and i is 0 otherwise. */ -const union value * +union value * cr_vector_to_value (const gsl_vector * vec, struct recoded_categorical *cr) { size_t i; @@ -321,8 +319,8 @@ design_matrix_create (int n_variables, size_t n_cols = 0; size_t col; - dm = xmalloc (sizeof (*dm)); - dm->vars = xmalloc (n_variables * sizeof (struct variable *)); + dm = xmalloc (sizeof *dm); + dm->vars = xnmalloc (n_variables, sizeof *dm->vars); dm->n_vars = n_variables; for (i = 0; i < n_variables; i++) @@ -343,7 +341,7 @@ design_matrix_create (int n_variables, } } dm->m = gsl_matrix_calloc (n_data, n_cols); - dm->vars = xmalloc (dm->n_vars * sizeof (*(dm->vars))); + dm->vars = xnmalloc (dm->n_vars, sizeof *dm->vars); assert (dm->vars != NULL); col = 0; @@ -356,6 +354,7 @@ design_matrix_create (int n_variables, tmp = &(dm->vars[col]); tmp->v = v; tmp->first_column = col; + tmp->last_column = col; col++; } else if (v->type == ALPHA) @@ -384,7 +383,7 @@ design_matrix_destroy (struct design_matrix *dm) Return the index of the variable for the given column. */ -static const size_t +static size_t design_matrix_col_to_var_index (const struct design_matrix *dm, size_t col) { size_t i; @@ -403,22 +402,20 @@ design_matrix_col_to_var_index (const struct design_matrix *dm, size_t col) Return a pointer to the variable whose values are stored in column col. */ -const struct variable * +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; - const struct variable *v; index = design_matrix_col_to_var_index (dm, col); for (i = 0; i < dm->n_vars; i++) { dmv = dm->vars[i]; - v = (dmv.v)->index; - if (v->index == index) + if ((dmv.v)->index == index) { - return v; + return (struct variable *) dmv.v; } } return NULL; @@ -469,7 +466,7 @@ design_matrix_set_categorical (struct design_matrix *dm, size_t row, double x; assert (var->type == ALPHA); - gsl_vector_const_view vec = cr_value_to_vector (val, rc); + const gsl_vector_view vec = cr_value_to_vector (val, rc); /* Copying values here is not the 'most efficient' way,