add isl_pw_aff_ge_set

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

diff --git a/doc/user.pod b/doc/user.pod
index aa758bd..0d2eae8 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -2354,10 +2354,16 @@ Operations include
 
        __isl_give isl_basic_set *isl_aff_ge_basic_set(
                __isl_take isl_aff *aff1, __isl_take isl_aff *aff2);
+       __isl_give isl_set *isl_pw_aff_ge_set(
+               __isl_take isl_pw_aff *pwaff1,
+               __isl_take isl_pw_aff *pwaff2);
 
 The function C<isl_aff_ge_basic_set> returns a basic set
 containing those elements in the shared space
 of C<aff1> and C<aff2> where C<aff1> is greater than or equal to C<aff2>.
+The function C<isl_aff_ge_set> returns a set
+containing those elements in the shared domain
+of C<pwaff1> and C<pwaff2> where C<pwaff1> is greater than or equal to C<pwaff2>.
 
        #include <isl/aff.h>
        __isl_give isl_pw_aff *isl_pw_aff_max(

diff --git a/include/isl/aff.h b/include/isl/aff.h
index ae0f7df..55c44c7 100644 (file)
--- a/include/isl/aff.h
+++ b/include/isl/aff.h
@@ -126,6 +126,9 @@ __isl_give isl_pw_aff *isl_pw_aff_gist(__isl_take isl_pw_aff *pwaff,
 
 __isl_give isl_map *isl_map_from_pw_aff(__isl_take isl_pw_aff *pwaff);
 
+__isl_give isl_set *isl_pw_aff_ge_set(__isl_take isl_pw_aff *pwaff1,
+       __isl_take isl_pw_aff *pwaff2);
+
 __isl_give isl_printer *isl_printer_print_pw_aff(__isl_take isl_printer *p,
        __isl_keep isl_pw_aff *pwaff);
 void isl_pw_aff_dump(__isl_keep isl_pw_aff *pwaff);

diff --git a/isl_aff.c b/isl_aff.c
index b030a24..ed66c74 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -724,18 +724,27 @@ error:
        return NULL;
 }
 
+/* Return a basic set containing those elements in the space
+ * of aff where it is non-negative.
+ */
+__isl_give isl_basic_set *isl_aff_nonneg_basic_set(__isl_take isl_aff *aff)
+{
+       isl_constraint *ineq;
+
+       ineq = isl_inequality_from_aff(aff);
+
+       return isl_basic_set_from_constraint(ineq);
+}
+
 /* Return a basic set containing those elements in the shared space
  * of aff1 and aff2 where aff1 is greater than or equal to aff2.
  */
 __isl_give isl_basic_set *isl_aff_ge_basic_set(__isl_take isl_aff *aff1,
        __isl_take isl_aff *aff2)
 {
-       isl_constraint *ineq;
-
        aff1 = isl_aff_sub(aff1, aff2);
-       ineq = isl_inequality_from_aff(aff1);
 
-       return isl_basic_set_from_constraint(ineq);
+       return isl_aff_nonneg_basic_set(aff1);
 }
 
 __isl_give isl_aff *isl_aff_add_on_domain(__isl_keep isl_set *dom,
@@ -1042,3 +1051,49 @@ __isl_give isl_map *isl_map_from_pw_aff(__isl_take isl_pw_aff *pwaff)
 
        return map;
 }
+
+/* Return a set containing those elements in the domain
+ * of pwaff where it is non-negative.
+ */
+__isl_give isl_set *isl_pw_aff_nonneg_set(__isl_take isl_pw_aff *pwaff)
+{
+       int i;
+       isl_set *set;
+
+       if (!pwaff)
+               return NULL;
+
+       set = isl_set_empty(isl_pw_aff_get_dim(pwaff));
+
+       for (i = 0; i < pwaff->n; ++i) {
+               isl_basic_set *bset;
+               isl_set *set_i;
+
+               bset = isl_aff_nonneg_basic_set(isl_aff_copy(pwaff->p[i].aff));
+               set_i = isl_set_from_basic_set(bset);
+               set_i = isl_set_intersect(set_i, isl_set_copy(pwaff->p[i].set));
+               set = isl_set_union_disjoint(set, set_i);
+       }
+
+       isl_pw_aff_free(pwaff);
+
+       return set;
+}
+
+/* Return a set containing those elements in the shared domain
+ * of pwaff1 and pwaff2 where pwaff1 is greater than or equal to pwaff2.
+ */
+__isl_give isl_set *isl_pw_aff_ge_set(__isl_take isl_pw_aff *pwaff1,
+       __isl_take isl_pw_aff *pwaff2)
+{
+       isl_set *set1, *set2;
+
+       set1 = isl_pw_aff_domain(isl_pw_aff_copy(pwaff1));
+       set2 = isl_pw_aff_domain(isl_pw_aff_copy(pwaff2));
+       set1 = isl_set_intersect(set1, set2);
+       pwaff1 = isl_pw_aff_intersect_domain(pwaff1, isl_set_copy(set1));
+       pwaff2 = isl_pw_aff_intersect_domain(pwaff2, set1);
+       pwaff1 = isl_pw_aff_add(pwaff1, isl_pw_aff_neg(pwaff2));
+
+       return isl_pw_aff_nonneg_set(pwaff1);
+}