From 1fefe8b0498ece106ca798a18187e7d16d3f8c66 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Sun, 27 Sep 2009 21:38:20 +0200 Subject: [PATCH] isl_tab_from_recession_cone: take basic set instead of basic map as argument --- isl_convex_hull.c | 2 +- isl_tab.c | 28 ++++++++++++++-------------- isl_tab.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/isl_convex_hull.c b/isl_convex_hull.c index bbe06bdf..b3568530 100644 --- a/isl_convex_hull.c +++ b/isl_convex_hull.c @@ -937,7 +937,7 @@ static int isl_basic_set_is_bounded(struct isl_basic_set *bset) struct isl_tab *tab; int bounded; - tab = isl_tab_from_recession_cone((struct isl_basic_map *)bset); + tab = isl_tab_from_recession_cone(bset); bounded = isl_tab_cone_is_bounded(tab); isl_tab_free(tab); return bounded; diff --git a/isl_tab.c b/isl_tab.c index bf1166a8..fd4f891b 100644 --- a/isl_tab.c +++ b/isl_tab.c @@ -1390,35 +1390,35 @@ struct isl_tab *isl_tab_from_basic_set(struct isl_basic_set *bset) return isl_tab_from_basic_map((struct isl_basic_map *)bset); } -/* Construct a tableau corresponding to the recession cone of "bmap". +/* Construct a tableau corresponding to the recession cone of "bset". */ -struct isl_tab *isl_tab_from_recession_cone(struct isl_basic_map *bmap) +struct isl_tab *isl_tab_from_recession_cone(struct isl_basic_set *bset) { isl_int cst; int i; struct isl_tab *tab; - if (!bmap) + if (!bset) return NULL; - tab = isl_tab_alloc(bmap->ctx, bmap->n_eq + bmap->n_ineq, - isl_basic_map_total_dim(bmap), 0); + tab = isl_tab_alloc(bset->ctx, bset->n_eq + bset->n_ineq, + isl_basic_set_total_dim(bset), 0); if (!tab) return NULL; - tab->rational = ISL_F_ISSET(bmap, ISL_BASIC_MAP_RATIONAL); + tab->rational = ISL_F_ISSET(bset, ISL_BASIC_SET_RATIONAL); isl_int_init(cst); - for (i = 0; i < bmap->n_eq; ++i) { - isl_int_swap(bmap->eq[i][0], cst); - tab = add_eq(tab, bmap->eq[i]); - isl_int_swap(bmap->eq[i][0], cst); + for (i = 0; i < bset->n_eq; ++i) { + isl_int_swap(bset->eq[i][0], cst); + tab = add_eq(tab, bset->eq[i]); + isl_int_swap(bset->eq[i][0], cst); if (!tab) goto done; } - for (i = 0; i < bmap->n_ineq; ++i) { + for (i = 0; i < bset->n_ineq; ++i) { int r; - isl_int_swap(bmap->ineq[i][0], cst); - r = isl_tab_add_row(tab, bmap->ineq[i]); - isl_int_swap(bmap->ineq[i][0], cst); + isl_int_swap(bset->ineq[i][0], cst); + r = isl_tab_add_row(tab, bset->ineq[i]); + isl_int_swap(bset->ineq[i][0], cst); if (r < 0) goto error; tab->con[r].is_nonneg = 1; diff --git a/isl_tab.h b/isl_tab.h index 6c4d9471..e76b0f02 100644 --- a/isl_tab.h +++ b/isl_tab.h @@ -151,7 +151,7 @@ void isl_tab_free(struct isl_tab *tab); struct isl_tab *isl_tab_from_basic_map(struct isl_basic_map *bmap); struct isl_tab *isl_tab_from_basic_set(struct isl_basic_set *bset); -struct isl_tab *isl_tab_from_recession_cone(struct isl_basic_map *bmap); +struct isl_tab *isl_tab_from_recession_cone(struct isl_basic_set *bset); int isl_tab_cone_is_bounded(struct isl_tab *tab); struct isl_basic_map *isl_basic_map_update_from_tab(struct isl_basic_map *bmap, struct isl_tab *tab); -- 2.11.4.GIT