add isl_set_find_dim_by_name

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

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index fec85e6..a6e26b8 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -14,6 +14,7 @@
 #include <isl_mat_private.h>
 #include <isl/set.h>
 #include <isl/seq.h>
+#include <isl_options_private.h>
 #include "isl_equalities.h"
 #include "isl_tab.h"
 
@@ -116,6 +117,19 @@ __isl_give isl_basic_set *isl_basic_set_remove_redundancies(
                isl_basic_map_remove_redundancies((struct isl_basic_map *)bset);
 }
 
+/* Remove redundant constraints in each of the basic maps.
+ */
+__isl_give isl_map *isl_map_remove_redundancies(__isl_take isl_map *map)
+{
+       return isl_map_inline_foreach_basic_map(map,
+                                           &isl_basic_map_remove_redundancies);
+}
+
+__isl_give isl_set *isl_set_remove_redundancies(__isl_take isl_set *set)
+{
+       return isl_map_remove_redundancies(set);
+}
+
 /* Check if the set set is bound in the direction of the affine
  * constraint c and if so, set the constant term such that the
  * resulting constraint is a bounding constraint for the set.
@@ -188,24 +202,29 @@ __isl_give isl_basic_set *isl_basic_set_set_rational(
        return isl_basic_map_set_rational(bset);
 }
 
-static struct isl_set *isl_set_set_rational(struct isl_set *set)
+__isl_give isl_map *isl_map_set_rational(__isl_take isl_map *map)
 {
        int i;
 
-       set = isl_set_cow(set);
-       if (!set)
+       map = isl_map_cow(map);
+       if (!map)
                return NULL;
-       for (i = 0; i < set->n; ++i) {
-               set->p[i] = isl_basic_set_set_rational(set->p[i]);
-               if (!set->p[i])
+       for (i = 0; i < map->n; ++i) {
+               map->p[i] = isl_basic_map_set_rational(map->p[i]);
+               if (!map->p[i])
                        goto error;
        }
-       return set;
+       return map;
 error:
-       isl_set_free(set);
+       isl_map_free(map);
        return NULL;
 }
 
+__isl_give isl_set *isl_set_set_rational(__isl_take isl_set *set)
+{
+       return isl_map_set_rational(set);
+}
+
 static struct isl_basic_set *isl_basic_set_add_equality(
        struct isl_basic_set *bset, isl_int *c)
 {
@@ -629,8 +648,8 @@ static struct isl_basic_set *extend(struct isl_basic_set *hull,
                if (!facet || !hull_facet)
                        goto error;
                hull = isl_basic_set_cow(hull);
-               hull = isl_basic_set_extend_dim(hull,
-                       isl_dim_copy(hull->dim), 0, 0, facet->n_ineq);
+               hull = isl_basic_set_extend_space(hull,
+                       isl_space_copy(hull->dim), 0, 0, facet->n_ineq);
                if (!hull)
                        goto error;
                for (j = 0; j < facet->n_ineq; ++j) {
@@ -792,9 +811,9 @@ static struct isl_basic_set *convex_hull_0d(struct isl_set *set)
                return NULL;
 
        if (isl_set_is_empty(set))
-               convex_hull = isl_basic_set_empty(isl_dim_copy(set->dim));
+               convex_hull = isl_basic_set_empty(isl_space_copy(set->dim));
        else
-               convex_hull = isl_basic_set_universe(isl_dim_copy(set->dim));
+               convex_hull = isl_basic_set_universe(isl_space_copy(set->dim));
        isl_set_free(set);
        return convex_hull;
 }
@@ -943,7 +962,7 @@ static struct isl_basic_set *induced_lineality_space(
                goto error;
 
        dim = isl_basic_set_total_dim(bset1);
-       lin = isl_basic_set_alloc_dim(isl_basic_set_get_dim(bset1), 0,
+       lin = isl_basic_set_alloc_space(isl_basic_set_get_space(bset1), 0,
                                        bset1->n_eq + bset2->n_eq,
                                        bset1->n_ineq + bset2->n_ineq);
        lin = isl_basic_set_set_rational(lin);
@@ -1057,7 +1076,7 @@ error:
 static struct isl_basic_set *valid_direction_lp(
        struct isl_basic_set *bset1, struct isl_basic_set *bset2)
 {
-       struct isl_dim *dim;
+       isl_space *dim;
        struct isl_basic_set *lp;
        unsigned d;
        int n;
@@ -1068,8 +1087,8 @@ static struct isl_basic_set *valid_direction_lp(
        d = 1 + isl_basic_set_total_dim(bset1);
        n = 2 +
            2 * bset1->n_eq + bset1->n_ineq + 2 * bset2->n_eq + bset2->n_ineq;
-       dim = isl_dim_set_alloc(bset1->ctx, 0, n);
-       lp = isl_basic_set_alloc_dim(dim, 0, d, n);
+       dim = isl_space_set_alloc(bset1->ctx, 0, n);
+       lp = isl_basic_set_alloc_space(dim, 0, d, n);
        if (!lp)
                goto error;
        for (i = 0; i < n; ++i) {
@@ -1304,7 +1323,7 @@ static struct isl_basic_set *convex_hull_pair_pointed(
 
        bset1 = homogeneous_map(bset1, isl_mat_copy(T2));
        bset2 = homogeneous_map(bset2, T2);
-       set = isl_set_alloc_dim(isl_basic_set_get_dim(bset1), 2, 0);
+       set = isl_set_alloc_space(isl_basic_set_get_space(bset1), 2, 0);
        set = isl_set_add_basic_set(set, bset1);
        set = isl_set_add_basic_set(set, bset2);
        hull = uset_convex_hull(set);
@@ -1377,7 +1396,7 @@ static struct isl_basic_set *convex_hull_pair(struct isl_basic_set *bset1,
        }
        if (lin->n_eq < isl_basic_set_total_dim(lin)) {
                struct isl_set *set;
-               set = isl_set_alloc_dim(isl_basic_set_get_dim(bset1), 2, 0);
+               set = isl_set_alloc_space(isl_basic_set_get_space(bset1), 2, 0);
                set = isl_set_add_basic_set(set, bset1);
                set = isl_set_add_basic_set(set, bset2);
                return modulo_lineality(set, lin);
@@ -1407,7 +1426,7 @@ struct isl_basic_set *isl_basic_set_lineality_space(struct isl_basic_set *bset)
        isl_assert(bset->ctx, bset->n_div == 0, goto error);
        dim = isl_basic_set_total_dim(bset);
 
-       lin = isl_basic_set_alloc_dim(isl_basic_set_get_dim(bset), 0, dim, 0);
+       lin = isl_basic_set_alloc_space(isl_basic_set_get_space(bset), 0, dim, 0);
        if (!lin)
                goto error;
        for (i = 0; i < bset->n_eq; ++i) {
@@ -1449,12 +1468,12 @@ static struct isl_basic_set *uset_combined_lineality_space(struct isl_set *set)
        if (!set)
                return NULL;
        if (set->n == 0) {
-               struct isl_dim *dim = isl_set_get_dim(set);
+               isl_space *dim = isl_set_get_space(set);
                isl_set_free(set);
                return isl_basic_set_empty(dim);
        }
 
-       lin = isl_set_alloc_dim(isl_set_get_dim(set), set->n, 0);
+       lin = isl_set_alloc_space(isl_set_get_space(set), set->n, 0);
        for (i = 0; i < set->n; ++i)
                lin = isl_set_add_basic_set(lin,
                    isl_basic_set_lineality_space(isl_basic_set_copy(set->p[i])));
@@ -1652,7 +1671,7 @@ static struct isl_basic_set *common_constraints(struct isl_basic_set *hull,
        if (isl_hash_table_init(hull->ctx, table, min_constraints))
                goto error;
 
-       total = isl_dim_total(set->dim);
+       total = isl_space_dim(set->dim, isl_dim_all);
        for (i = 0; i < set->p[best]->n_ineq; ++i) {
                constraints[i].c = isl_mat_sub_alloc6(hull->ctx,
                        set->p[best]->ineq + i, 0, 1, 0, 1 + total);
@@ -1749,7 +1768,7 @@ static struct isl_basic_set *proto_hull(struct isl_set *set, int *is_hull)
                n_ineq += set->p[i]->n_eq;
                n_ineq += set->p[i]->n_ineq;
        }
-       hull = isl_basic_set_alloc_dim(isl_dim_copy(set->dim), 0, 0, n_ineq);
+       hull = isl_basic_set_alloc_space(isl_space_copy(set->dim), 0, 0, n_ineq);
        hull = isl_basic_set_set_rational(hull);
        if (!hull)
                return NULL;
@@ -1835,7 +1854,7 @@ static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
                goto error;
 
        if (isl_set_n_dim(set) == 0) {
-               convex_hull = isl_basic_set_universe(isl_dim_copy(set->dim));
+               convex_hull = isl_basic_set_universe(isl_space_copy(set->dim));
                isl_set_free(set);
                convex_hull = isl_basic_set_set_rational(convex_hull);
                return convex_hull;
@@ -2261,7 +2280,7 @@ static struct isl_basic_set *uset_simple_hull(struct isl_set *set)
                n_ineq += 2 * set->p[i]->n_eq + set->p[i]->n_ineq;
        }
 
-       hull = isl_basic_set_alloc_dim(isl_dim_copy(set->dim), 0, 0, n_ineq);
+       hull = isl_basic_set_alloc_space(isl_space_copy(set->dim), 0, 0, n_ineq);
        if (!hull)
                goto error;