add isl_basic_map_fast_is_empty

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

diff --git a/isl_sample.c b/isl_sample.c
index 4ad8aeb..bda8f68 100644 (file)
--- a/isl_sample.c
+++ b/isl_sample.c
@@ -2,6 +2,7 @@
 #include "isl_sample_piplib.h"
 #include "isl_vec.h"
 #include "isl_mat.h"
+#include "isl_seq.h"
 #include "isl_map_private.h"
 #include "isl_equalities.h"
 
@@ -60,18 +61,20 @@ static struct isl_mat *independent_bounds(struct isl_ctx *ctx,
 {
        int i, j, n;
        struct isl_mat *dirs = NULL;
+       unsigned dim;
 
        if (!bset)
                return NULL;
 
+       dim = isl_basic_set_n_dim(bset);
        if (bset->n_ineq == 0)
-               return isl_mat_alloc(ctx, 0, bset->dim);
+               return isl_mat_alloc(ctx, 0, dim);
 
-       dirs = isl_mat_alloc(ctx, bset->dim, bset->dim);
+       dirs = isl_mat_alloc(ctx, dim, dim);
        if (!dirs)
                return NULL;
        isl_seq_cpy(dirs->row[0], bset->ineq[0]+1, dirs->n_col);
-       for (j = 1, n = 1; n < bset->dim && j < bset->n_ineq; ++j) {
+       for (j = 1, n = 1; n < dim && j < bset->n_ineq; ++j) {
                int pos;
 
                isl_seq_cpy(dirs->row[n], bset->ineq[j]+1, dirs->n_col);
@@ -113,7 +116,7 @@ static struct isl_basic_set *remove_lineality(struct isl_ctx *ctx,
        struct isl_mat *U = NULL;
        unsigned old_dim, new_dim;
 
-       old_dim = bset->dim;
+       old_dim = isl_basic_set_n_dim(bset);
        new_dim = bounds->n_row;
        *T = NULL;
        bounds = isl_mat_left_hermite(ctx, bounds, 0, &U, NULL);
@@ -121,7 +124,7 @@ static struct isl_basic_set *remove_lineality(struct isl_ctx *ctx,
                goto error;
        U = isl_mat_lin_to_aff(ctx, U);
        U = isl_mat_drop_cols(ctx, U, 1 + new_dim, old_dim - new_dim);
-       bset = isl_basic_set_preimage(ctx, bset, isl_mat_copy(ctx, U));
+       bset = isl_basic_set_preimage(bset, isl_mat_copy(ctx, U));
        if (!bset)
                goto error;
        *T = U;
@@ -138,16 +141,18 @@ struct isl_vec *isl_basic_set_sample(struct isl_basic_set *bset)
 {
        struct isl_ctx *ctx;
        struct isl_mat *bounds;
+       unsigned dim;
        if (!bset)
                return NULL;
 
        ctx = bset->ctx;
-       if (F_ISSET(bset, ISL_BASIC_SET_EMPTY)) {
+       if (ISL_F_ISSET(bset, ISL_BASIC_SET_EMPTY)) {
                isl_basic_set_free(bset);
                return isl_vec_alloc(ctx, 0);
        }
 
-       isl_assert(ctx, bset->nparam == 0, goto error);
+       dim = isl_basic_set_n_dim(bset);
+       isl_assert(ctx, isl_basic_set_n_param(bset) == 0, goto error);
        isl_assert(ctx, bset->n_div == 0, goto error);
 
        if (bset->n_eq > 0) {
@@ -162,14 +167,14 @@ struct isl_vec *isl_basic_set_sample(struct isl_basic_set *bset)
                        isl_mat_free(ctx, T);
                return sample;
        }
-       if (bset->dim == 0)
+       if (dim == 0)
                return point_sample(ctx, bset);
-       if (bset->dim == 1)
+       if (dim == 1)
                return interval_sample(ctx, bset);
        bounds = independent_bounds(ctx, bset);
        if (!bounds)
                goto error;
-       if (bounds->n_row == bset->dim)
+       if (bounds->n_row == dim)
                isl_mat_free(ctx, bounds);
        else {
                struct isl_mat *T;