Merge branch 'maint'

[platform/upstream/isl.git] / isl_mat.c

diff --git a/isl_mat.c b/isl_mat.c
index e64beae..9724900 100644 (file)
--- a/isl_mat.c
+++ b/isl_mat.c
@@ -8,11 +8,11 @@
  */
 
 #include <isl_ctx_private.h>
-#include <isl/dim.h>
+#include <isl/space.h>
 #include <isl/seq.h>
 #include <isl_mat_private.h>
 #include "isl_map_private.h"
-#include <isl_dim_private.h>
+#include <isl_space_private.h>
 
 isl_ctx *isl_mat_get_ctx(__isl_keep isl_mat *mat)
 {
@@ -281,7 +281,7 @@ error:
        return NULL;
 }
 
-struct isl_mat *isl_mat_identity(struct isl_ctx *ctx, unsigned n_row)
+__isl_give isl_mat *isl_mat_diag(isl_ctx *ctx, unsigned n_row, isl_int d)
 {
        int i;
        struct isl_mat *mat;
@@ -291,13 +291,20 @@ struct isl_mat *isl_mat_identity(struct isl_ctx *ctx, unsigned n_row)
                return NULL;
        for (i = 0; i < n_row; ++i) {
                isl_seq_clr(mat->row[i], i);
-               isl_int_set_si(mat->row[i][i], 1);
+               isl_int_set(mat->row[i][i], d);
                isl_seq_clr(mat->row[i]+i+1, n_row-(i+1));
        }
 
        return mat;
 }
 
+__isl_give isl_mat *isl_mat_identity(isl_ctx *ctx, unsigned n_row)
+{
+       if (!ctx)
+               return NULL;
+       return isl_mat_diag(ctx, n_row, ctx->one);
+}
+
 struct isl_vec *isl_mat_vec_product(struct isl_mat *mat, struct isl_vec *vec)
 {
        int i;
@@ -1064,7 +1071,7 @@ struct isl_basic_set *isl_basic_set_preimage(struct isl_basic_set *bset,
                if (!bset)
                        goto error;
        } else if (mat->n_col < mat->n_row) {
-               bset->dim = isl_dim_cow(bset->dim);
+               bset->dim = isl_space_cow(bset->dim);
                if (!bset->dim)
                        goto error;
                bset->dim->n_out -= mat->n_row - mat->n_col;
@@ -1115,7 +1122,7 @@ struct isl_set *isl_set_preimage(struct isl_set *set, struct isl_mat *mat)
                        goto error;
        }
        if (mat->n_col != mat->n_row) {
-               set->dim = isl_dim_cow(set->dim);
+               set->dim = isl_space_cow(set->dim);
                if (!set->dim)
                        goto error;
                set->dim->n_out += mat->n_col;