isl_map_read: accept '*' in affine expressions

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

diff --git a/isl_sample.c b/isl_sample.c
index 4e2cdd6..f7c1c87 100644 (file)
--- a/isl_sample.c
+++ b/isl_sample.c
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2008-2009 Katholieke Universiteit Leuven
+ *
+ * Use of this software is governed by the GNU LGPLv2.1 license
+ *
+ * Written by Sven Verdoolaege, K.U.Leuven, Departement
+ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
+ */
+
 #include "isl_sample.h"
 #include "isl_sample_piplib.h"
 #include "isl_vec.h"
@@ -7,6 +16,7 @@
 #include "isl_equalities.h"
 #include "isl_tab.h"
 #include "isl_basis_reduction.h"
+#include <isl_point_private.h>
 
 static struct isl_vec *empty_sample(struct isl_basic_set *bset)
 {
@@ -271,8 +281,8 @@ static struct isl_mat *tab_equalities(struct isl_tab *tab)
        if (!tab)
                return NULL;
 
-       isl_assert(tab->mat->ctx, tab->bset, return NULL);
-       bset = tab->bset;
+       bset = isl_tab_peek_bset(tab);
+       isl_assert(tab->mat->ctx, bset, return NULL);
 
        n_eq = tab->n_var - tab->n_col + tab->n_dead;
        if (tab->empty || n_eq == 0)
@@ -561,13 +571,21 @@ static struct isl_vec *sample_bounded(struct isl_basic_set *bset)
        ctx = bset->ctx;
 
        tab = isl_tab_from_basic_set(bset);
+       if (tab && tab->empty) {
+               isl_tab_free(tab);
+               ISL_F_SET(bset, ISL_BASIC_SET_EMPTY);
+               sample = isl_vec_alloc(bset->ctx, 0);
+               isl_basic_set_free(bset);
+               return sample;
+       }
+
+       if (isl_tab_track_bset(tab, isl_basic_set_copy(bset)) < 0)
+               goto error;
        if (!ISL_F_ISSET(bset, ISL_BASIC_SET_NO_IMPLICIT))
                tab = isl_tab_detect_implicit_equalities(tab);
        if (!tab)
                goto error;
 
-       tab->bset = isl_basic_set_copy(bset);
-
        sample = isl_tab_sample(tab);
        if (!sample)
                goto error;
@@ -954,9 +972,10 @@ static int tab_shift_cone(struct isl_tab *tab,
        isl_int_init(v);
        if (!tab || !tab_cone || !U)
                goto error;
-       bset = tab_cone->bset;
+       bset = isl_tab_peek_bset(tab_cone);
        U = isl_mat_drop_cols(U, 0, tab->n_var - tab->n_unbounded);
        for (i = 0; i < bset->n_ineq; ++i) {
+               int ok;
                struct isl_vec *row = NULL;
                if (isl_tab_is_equality(tab_cone, tab_cone->n_eq + i))
                        continue;
@@ -973,9 +992,9 @@ static int tab_shift_cone(struct isl_tab *tab,
                        continue;
                tab = isl_tab_extend(tab, 1);
                isl_int_add(bset->ineq[i][0], bset->ineq[i][0], v);
-               tab = isl_tab_add_ineq(tab, bset->ineq[i]);
+               ok = isl_tab_add_ineq(tab, bset->ineq[i]) >= 0;
                isl_int_sub(bset->ineq[i][0], bset->ineq[i][0], v);
-               if (!tab)
+               if (!ok)
                        goto error;
        }
 
@@ -1228,3 +1247,41 @@ __isl_give isl_basic_set *isl_set_sample(__isl_take isl_set *set)
 {
        return (isl_basic_set *) isl_map_sample((isl_map *)set);
 }
+
+__isl_give isl_point *isl_basic_set_sample_point(__isl_take isl_basic_set *bset)
+{
+       isl_vec *vec;
+       isl_dim *dim;
+
+       dim = isl_basic_set_get_dim(bset);
+       bset = isl_basic_set_underlying_set(bset);
+       vec = isl_basic_set_sample_vec(bset);
+
+       return isl_point_alloc(dim, vec);
+}
+
+__isl_give isl_point *isl_set_sample_point(__isl_take isl_set *set)
+{
+       int i;
+       isl_point *pnt;
+
+       if (!set)
+               return NULL;
+
+       for (i = 0; i < set->n; ++i) {
+               pnt = isl_basic_set_sample_point(isl_basic_set_copy(set->p[i]));
+               if (!pnt)
+                       goto error;
+               if (!isl_point_is_void(pnt))
+                       break;
+               isl_point_free(pnt);
+       }
+       if (i == set->n)
+               pnt = isl_point_void(isl_set_get_dim(set));
+
+       isl_set_free(set);
+       return pnt;
+error:
+       isl_set_free(set);
+       return NULL;
+}