avoid use of isl_constraint_add_div in isl_test

At some point we want to remove isl_div entirely.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

diff --git a/isl_test.c b/isl_test.c
index a837054..610e67c 100644 (file)
--- a/isl_test.c
+++ b/isl_test.c
@@ -235,16 +235,14 @@ void test_dim(struct isl_ctx *ctx)
 void test_div(struct isl_ctx *ctx)
 {
        isl_int v;
-       int pos;
        struct isl_dim *dim;
-       struct isl_div *div;
        struct isl_basic_set *bset;
        struct isl_constraint *c;
 
        isl_int_init(v);
 
        /* test 1 */
-       dim = isl_dim_set_alloc(ctx, 0, 1);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -252,10 +250,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, 1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -263,17 +259,17 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
        assert(bset && bset->n_div == 1);
        isl_basic_set_free(bset);
 
        /* test 2 */
-       dim = isl_dim_set_alloc(ctx, 0, 1);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -281,10 +277,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -292,17 +286,17 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, 1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
        assert(bset && bset->n_div == 1);
        isl_basic_set_free(bset);
 
        /* test 3 */
-       dim = isl_dim_set_alloc(ctx, 0, 1);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -310,10 +304,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -321,17 +313,17 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, 1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 4);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
        assert(bset && bset->n_div == 1);
        isl_basic_set_free(bset);
 
        /* test 4 */
-       dim = isl_dim_set_alloc(ctx, 0, 1);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -339,10 +331,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -350,26 +340,24 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        isl_int_set_si(v, 1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 6);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
        assert(isl_basic_set_is_empty(bset));
        isl_basic_set_free(bset);
 
        /* test 5 */
-       dim = isl_dim_set_alloc(ctx, 0, 2);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -379,20 +367,20 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 1);
+
        assert(bset && bset->n_div == 0);
        isl_basic_set_free(bset);
 
        /* test 6 */
-       dim = isl_dim_set_alloc(ctx, 0, 2);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 6);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -402,6 +390,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 1);
+
        assert(bset && bset->n_div == 1);
        isl_basic_set_free(bset);
 
@@ -415,7 +405,7 @@ void test_div(struct isl_ctx *ctx)
         * and we end up with the original equality and div again.
         * Perhaps we can avoid the introduction of this temporary div.
         */
-       dim = isl_dim_set_alloc(ctx, 0, 3);
+       dim = isl_dim_set_alloc(ctx, 0, 4);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -425,12 +415,12 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        isl_int_set_si(v, -3);
        isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 6);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 3, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 3, 1);
+
        /* Test disabled for now */
        /*
        assert(bset && bset->n_div == 1);
@@ -438,7 +428,7 @@ void test_div(struct isl_ctx *ctx)
        isl_basic_set_free(bset);
 
        /* test 8 */
-       dim = isl_dim_set_alloc(ctx, 0, 4);
+       dim = isl_dim_set_alloc(ctx, 0, 5);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -448,10 +438,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
        isl_int_set_si(v, -3);
        isl_constraint_set_coefficient(c, isl_dim_set, 3, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 6);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 4, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -463,6 +451,8 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_constant(c, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 4, 1);
+
        /* Test disabled for now */
        /*
        assert(bset && bset->n_div == 1);
@@ -470,7 +460,7 @@ void test_div(struct isl_ctx *ctx)
        isl_basic_set_free(bset);
 
        /* test 9 */
-       dim = isl_dim_set_alloc(ctx, 0, 2);
+       dim = isl_dim_set_alloc(ctx, 0, 4);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
@@ -478,23 +468,21 @@ void test_div(struct isl_ctx *ctx)
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, -2);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
        isl_int_set_si(v, -1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, 3);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 3, v);
        isl_int_set_si(v, 2);
        isl_constraint_set_constant(c, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 2);
+
        bset = isl_basic_set_fix_si(bset, isl_dim_set, 0, 2);
 
        assert(!isl_basic_set_is_empty(bset));
@@ -502,18 +490,18 @@ void test_div(struct isl_ctx *ctx)
        isl_basic_set_free(bset);
 
        /* test 10 */
-       dim = isl_dim_set_alloc(ctx, 0, 2);
+       dim = isl_dim_set_alloc(ctx, 0, 3);
        bset = isl_basic_set_universe(dim);
 
        c = isl_equality_alloc(isl_basic_set_get_dim(bset));
        isl_int_set_si(v, 1);
        isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
-       div = isl_div_alloc(isl_basic_set_get_dim(bset));
-       c = isl_constraint_add_div(c, div, &pos);
        isl_int_set_si(v, -2);
-       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
        bset = isl_basic_set_add_constraint(bset, c);
 
+       bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 1);
+
        bset = isl_basic_set_fix_si(bset, isl_dim_set, 0, 2);
 
        isl_basic_set_free(bset);