static INLINE void alloc_cols(row_col_t *row, int c_cols) {
assert(c_cols > row->c_cols);
row->c_cols = c_cols;
- row->cols = xrealloc(row->cols, c_cols * sizeof(*row->cols));
+ row->cols = XREALLOC(row->cols, col_val_t, c_cols);
}
static INLINE void alloc_rows(gs_matrix_t *m, int c_rows, int c_cols, int begin_init) {
assert(c_rows > m->c_rows);
m->c_rows = c_rows;
- m->rows = xrealloc(m->rows, c_rows * sizeof(*m->rows));
+ m->rows = XREALLOC(m->rows, row_col_t, c_rows);
for (i = begin_init; i < c_rows; ++i) {
m->rows[i].c_cols = 0;
}
gs_matrix_t *gs_new_matrix(int n_init_rows, int n_init_cols) {
- gs_matrix_t *res = xmalloc(sizeof(*res));
- memset(res, 0, sizeof(*res));
+ gs_matrix_t *res = XMALLOCZ(gs_matrix_t);
if (n_init_rows < 16)
n_init_rows = 16;
res->initial_col_increase = n_init_cols;
if (the_row->c_cols) {
the_row->c_cols = the_row->n_cols;
if (the_row->c_cols)
- the_row->cols = xrealloc(the_row->cols, the_row->c_cols * sizeof(*the_row->cols));
+ the_row->cols = XREALLOC(the_row->cols, col_val_t, the_row->c_cols);
else
xfree(the_row->cols);
}
int min, max, c, i;
if (row >= m->c_rows) {
- int new_c_rows = ROW_INCREASE_FACTOR * row;
+ int new_c_rows = (int)(ROW_INCREASE_FACTOR * row);
alloc_rows(m, new_c_rows, m->initial_col_increase, m->c_rows);
}
}
double gs_matrix_get(const gs_matrix_t *m, int row, int col) {
+ row_col_t *the_row;
int c;
+
if (row >= m->c_rows)
return 0.0;
- row_col_t *the_row = &m->rows[row];
+
+ the_row = &m->rows[row];
if (row == col)
return the_row->diag != 0.0 ? 1.0 / the_row->diag : 0.0;
void gs_matrix_dump(const gs_matrix_t *m, int a, int b, FILE *out) {
int effective_rows = MIN(a, m->c_rows);
int r, c, i;
- double *elems = xmalloc(b * sizeof(*elems));
+ double *elems = XMALLOCN(double, b);
// The rows which have some content
for (r=0; r < effective_rows; ++r) {
+ row_col_t *row = &m->rows[r];
+
memset(elems, 0, b * sizeof(*elems));
- row_col_t *row = &m->rows[r];
for (c = 0; c < row->n_cols; ++c) {
int col_idx = row->cols[c].col_idx;
elems[col_idx] = row->cols[c].v;