X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_convex_hull.c;h=a6e26b8448f0ec47d7c2883aabd177894d3d24c2;hb=f5e4e6f324ebd2eb8edb47e57880be621a3e58e1;hp=d3d5ff232c38e26d5c1db748071025b3f43d4029;hpb=ae24e1036a2724fb889c5d2afcc6669f92369f10;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index d3d5ff2..a6e26b8 100644
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -7,28 +7,19 @@
  * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
  */
 
-#include "isl_lp.h"
-#include "isl_map.h"
-#include "isl_map_private.h"
-#include "isl_mat.h"
-#include "isl_set.h"
-#include "isl_seq.h"
+#include <isl_ctx_private.h>
+#include <isl_map_private.h>
+#include <isl/lp.h>
+#include <isl/map.h>
+#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"
 
 static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set);
 
-static void swap_ineq(struct isl_basic_map *bmap, unsigned i, unsigned j)
-{
-	isl_int *t;
-
-	if (i != j) {
-		t = bmap->ineq[i];
-		bmap->ineq[i] = bmap->ineq[j];
-		bmap->ineq[j] = t;
-	}
-}
-
 /* Return 1 if constraint c is redundant with respect to the constraints
  * in bmap.  If c is a lower [upper] bound in some variable and bmap
  * does not have a lower [upper] bound in that variable, then c cannot
@@ -126,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.
@@ -174,41 +178,53 @@ error:
 	return -1;
 }
 
-struct isl_basic_set *isl_basic_set_set_rational(struct isl_basic_set *bset)
+__isl_give isl_basic_map *isl_basic_map_set_rational(
+	__isl_take isl_basic_set *bmap)
 {
-	if (!bset)
+	if (!bmap)
 		return NULL;
 
-	if (ISL_F_ISSET(bset, ISL_BASIC_MAP_RATIONAL))
-		return bset;
+	if (ISL_F_ISSET(bmap, ISL_BASIC_MAP_RATIONAL))
+		return bmap;
 
-	bset = isl_basic_set_cow(bset);
-	if (!bset)
+	bmap = isl_basic_map_cow(bmap);
+	if (!bmap)
 		return NULL;
 
-	ISL_F_SET(bset, ISL_BASIC_MAP_RATIONAL);
+	ISL_F_SET(bmap, ISL_BASIC_MAP_RATIONAL);
+
+	return isl_basic_map_finalize(bmap);
+}
 
-	return isl_basic_set_finalize(bset);
+__isl_give isl_basic_set *isl_basic_set_set_rational(
+	__isl_take isl_basic_set *bset)
+{
+	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)
 {
@@ -290,6 +306,7 @@ static struct isl_basic_set *wrap_constraints(struct isl_set *set)
 		n_ineq += set->p[i]->n_ineq;
 	}
 	lp = isl_basic_set_alloc(set->ctx, 0, dim * set->n, 0, n_eq, n_ineq);
+	lp = isl_basic_set_set_rational(lp);
 	if (!lp)
 		return NULL;
 	lp_dim = isl_basic_set_n_dim(lp);
@@ -427,6 +444,7 @@ isl_int *isl_set_wrap_facet(__isl_keep isl_set *set,
 	if (res == isl_lp_ok) {
 		isl_int_neg(num, num);
 		isl_seq_combine(facet, num, facet, den, ridge, dim);
+		isl_seq_normalize(ctx, facet, dim);
 	}
 	isl_int_clear(num);
 	isl_int_clear(den);
@@ -475,7 +493,9 @@ static __isl_give isl_mat *initial_facet_constraint(__isl_keep isl_set *set)
 	isl_seq_clr(bounds->row[0], dim);
 	isl_int_set_si(bounds->row[0][1 + dim - 1], 1);
 	is_bound = uset_is_bound(set, bounds->row[0], 1 + dim);
-	isl_assert(set->ctx, is_bound == 1, goto error);
+	if (is_bound < 0)
+		goto error;
+	isl_assert(set->ctx, is_bound, goto error);
 	isl_seq_normalize(set->ctx, bounds->row[0], 1 + dim);
 	bounds->n_row = 1;
 
@@ -628,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) {
@@ -783,13 +803,6 @@ error:
 	return NULL;
 }
 
-/* Project out final n dimensions using Fourier-Motzkin */
-static struct isl_set *set_project_out(struct isl_ctx *ctx,
-	struct isl_set *set, unsigned n)
-{
-	return isl_set_remove_dims(set, isl_set_n_dim(set) - n, n);
-}
-
 static struct isl_basic_set *convex_hull_0d(struct isl_set *set)
 {
 	struct isl_basic_set *convex_hull;
@@ -798,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;
 }
@@ -866,7 +879,7 @@ static struct isl_basic_set *convex_hull_pair_elim(struct isl_basic_set *bset1,
 		isl_int_set_si(hull->eq[k][2*(1+dim)+j], 1);
 	}
 	hull = isl_basic_set_set_rational(hull);
-	hull = isl_basic_set_remove_dims(hull, dim, 2*(1+dim));
+	hull = isl_basic_set_remove_dims(hull, isl_dim_set, dim, 2*(1+dim));
 	hull = isl_basic_set_remove_redundancies(hull);
 	isl_basic_set_free(bset1);
 	isl_basic_set_free(bset2);
@@ -887,7 +900,7 @@ int isl_basic_set_is_bounded(__isl_keep isl_basic_set *bset)
 
 	if (!bset)
 		return -1;
-	if (isl_basic_set_fast_is_empty(bset))
+	if (isl_basic_set_plain_is_empty(bset))
 		return 1;
 
 	tab = isl_tab_from_recession_cone(bset, 1);
@@ -896,6 +909,25 @@ int isl_basic_set_is_bounded(__isl_keep isl_basic_set *bset)
 	return bounded;
 }
 
+/* Is the image bounded for each value of the parameters and
+ * the domain variables?
+ */
+int isl_basic_map_image_is_bounded(__isl_keep isl_basic_map *bmap)
+{
+	unsigned nparam = isl_basic_map_dim(bmap, isl_dim_param);
+	unsigned n_in = isl_basic_map_dim(bmap, isl_dim_in);
+	int bounded;
+
+	bmap = isl_basic_map_copy(bmap);
+	bmap = isl_basic_map_cow(bmap);
+	bmap = isl_basic_map_move_dims(bmap, isl_dim_param, nparam,
+					isl_dim_in, 0, n_in);
+	bounded = isl_basic_set_is_bounded((isl_basic_set *)bmap);
+	isl_basic_map_free(bmap);
+
+	return bounded;
+}
+
 /* Is the set bounded for each value of the parameters?
  */
 int isl_set_is_bounded(__isl_keep isl_set *set)
@@ -930,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);
@@ -1008,7 +1040,7 @@ static struct isl_basic_set *modulo_lineality(struct isl_set *set,
 	if (!set || !lin)
 		goto error;
 	lin_dim = total - lin->n_eq;
-	M = isl_mat_sub_alloc(set->ctx, lin->eq, 0, lin->n_eq, 1, total);
+	M = isl_mat_sub_alloc6(set->ctx, lin->eq, 0, lin->n_eq, 1, total);
 	M = isl_mat_left_hermite(M, 0, &U, &Q);
 	if (!M)
 		goto error;
@@ -1021,7 +1053,7 @@ static struct isl_basic_set *modulo_lineality(struct isl_set *set,
 	Q = isl_mat_lin_to_aff(Q);
 
 	set = isl_set_preimage(set, U);
-	set = isl_set_remove_dims(set, total - lin_dim, lin_dim);
+	set = isl_set_remove_dims(set, isl_dim_set, total - lin_dim, lin_dim);
 	hull = uset_convex_hull(set);
 	hull = isl_basic_set_preimage(hull, Q);
 
@@ -1044,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;
@@ -1055,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) {
@@ -1072,23 +1104,25 @@ static struct isl_basic_set *valid_direction_lp(
 		if (k < 0)
 			goto error;
 		n = 0;
-		isl_int_set_si(lp->eq[k][n++], 0);
+		isl_int_set_si(lp->eq[k][n], 0); n++;
 		/* positivity constraint 1 >= 0 */
-		isl_int_set_si(lp->eq[k][n++], i == 0);
+		isl_int_set_si(lp->eq[k][n], i == 0); n++;
 		for (j = 0; j < bset1->n_eq; ++j) {
-			isl_int_set(lp->eq[k][n++], bset1->eq[j][i]);
-			isl_int_neg(lp->eq[k][n++], bset1->eq[j][i]);
+			isl_int_set(lp->eq[k][n], bset1->eq[j][i]); n++;
+			isl_int_neg(lp->eq[k][n], bset1->eq[j][i]); n++;
+		}
+		for (j = 0; j < bset1->n_ineq; ++j) {
+			isl_int_set(lp->eq[k][n], bset1->ineq[j][i]); n++;
 		}
-		for (j = 0; j < bset1->n_ineq; ++j)
-			isl_int_set(lp->eq[k][n++], bset1->ineq[j][i]);
 		/* positivity constraint 1 >= 0 */
-		isl_int_set_si(lp->eq[k][n++], -(i == 0));
+		isl_int_set_si(lp->eq[k][n], -(i == 0)); n++;
 		for (j = 0; j < bset2->n_eq; ++j) {
-			isl_int_neg(lp->eq[k][n++], bset2->eq[j][i]);
-			isl_int_set(lp->eq[k][n++], bset2->eq[j][i]);
+			isl_int_neg(lp->eq[k][n], bset2->eq[j][i]); n++;
+			isl_int_set(lp->eq[k][n], bset2->eq[j][i]); n++;
+		}
+		for (j = 0; j < bset2->n_ineq; ++j) {
+			isl_int_neg(lp->eq[k][n], bset2->ineq[j][i]); n++;
 		}
-		for (j = 0; j < bset2->n_ineq; ++j)
-			isl_int_neg(lp->eq[k][n++], bset2->ineq[j][i]);
 	}
 	lp = isl_basic_set_gauss(lp, NULL);
 	isl_basic_set_free(bset1);
@@ -1148,7 +1182,7 @@ static struct isl_vec *valid_direction(
 	isl_seq_clr(dir->block.data + 1, dir->size - 1);
 	n = 1;
 	/* positivity constraint 1 >= 0 */
-	isl_int_set(dir->block.data[0], sample->block.data[n++]);
+	isl_int_set(dir->block.data[0], sample->block.data[n]); n++;
 	for (i = 0; i < bset1->n_eq; ++i) {
 		isl_int_sub(sample->block.data[n],
 			    sample->block.data[n], sample->block.data[n+1]);
@@ -1289,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);
@@ -1328,6 +1362,9 @@ static struct isl_basic_set *convex_hull_pair(struct isl_basic_set *bset1,
 	isl_basic_set *lin, *aff;
 	int bounded1, bounded2;
 
+	if (bset1->ctx->opt->convex == ISL_CONVEX_HULL_FM)
+		return convex_hull_pair_elim(bset1, bset2);
+
 	aff = isl_set_affine_hull(isl_basic_set_union(isl_basic_set_copy(bset1),
 						    isl_basic_set_copy(bset2)));
 	if (!aff)
@@ -1359,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);
@@ -1389,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) {
@@ -1431,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])));
@@ -1634,9 +1671,9 @@ 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_alloc(hull->ctx,
+		constraints[i].c = isl_mat_sub_alloc6(hull->ctx,
 			set->p[best]->ineq + i, 0, 1, 0, 1 + total);
 		if (!constraints[i].c)
 			goto error;
@@ -1731,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;
@@ -1783,7 +1820,8 @@ static struct isl_basic_set *uset_convex_hull(struct isl_set *set)
 	if (isl_set_n_dim(set) == 1)
 		return convex_hull_1d(set);
 
-	if (isl_set_is_bounded(set))
+	if (isl_set_is_bounded(set) &&
+	    set->ctx->opt->convex == ISL_CONVEX_HULL_WRAP)
 		return uset_convex_hull_wrap(set);
 
 	lin = uset_combined_lineality_space(isl_set_copy(set));
@@ -1816,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;
@@ -1932,6 +1970,19 @@ struct isl_basic_set *isl_set_convex_hull(struct isl_set *set)
 		isl_map_convex_hull((struct isl_map *)set);
 }
 
+__isl_give isl_basic_map *isl_map_polyhedral_hull(__isl_take isl_map *map)
+{
+	isl_basic_map *hull;
+
+	hull = isl_map_convex_hull(map);
+	return isl_basic_map_remove_divs(hull);
+}
+
+__isl_give isl_basic_set *isl_set_polyhedral_hull(__isl_take isl_set *set)
+{
+	return (isl_basic_set *)isl_map_polyhedral_hull((isl_map *)set);
+}
+
 struct sh_data_entry {
 	struct isl_hash_table	*table;
 	struct isl_tab		*tab;
@@ -2229,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;