rename isl_pw_aff_max to isl_pw_aff_union_max

Most binary operations on isl_pw_affs are only defined on
the intersection of the definition domains of the two arguments.
Rename isl_pw_aff_max to emphasize that the definition domain
of its result is the union of these definition domains.

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

diff --git a/doc/user.pod b/doc/user.pod
index 760a664..1563e77 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -93,6 +93,15 @@ but they will be removed in the future.
 
 =back
 
+=head3 Changes since isl-0.07
+
+=over
+
+=item * The function C<isl_pw_aff_max> has been renamed to
+C<isl_pw_aff_union_max>.
+
+=back
+
 =head1 Installation
 
 The source of C<isl> can be obtained either as a tarball
@@ -2497,11 +2506,11 @@ for elements in C<cond> and equal to C<pwaff_false> for elements
 not in C<cond>.
 
        #include <isl/aff.h>
-       __isl_give isl_pw_aff *isl_pw_aff_max(
+       __isl_give isl_pw_aff *isl_pw_aff_union_max(
                __isl_take isl_pw_aff *pwaff1,
                __isl_take isl_pw_aff *pwaff2);
 
-The function C<isl_pw_aff_max> computes a piecewise quasi-affine
+The function C<isl_pw_aff_union_max> computes a piecewise quasi-affine
 expression with a domain that is the union of those of C<pwaff1> and
 C<pwaff2> and such that on each cell, the quasi-affine expression is
 the maximum of those of C<pwaff1> and C<pwaff2>.  If only one of

diff --git a/include/isl/aff.h b/include/isl/aff.h
index 916c9db..903815d 100644 (file)
--- a/include/isl/aff.h
+++ b/include/isl/aff.h
@@ -96,7 +96,7 @@ __isl_give isl_pw_aff *isl_pw_aff_alloc(__isl_take isl_set *set,
 
 int isl_pw_aff_is_empty(__isl_keep isl_pw_aff *pwaff);
 
-__isl_give isl_pw_aff *isl_pw_aff_max(__isl_take isl_pw_aff *pwaff1,
+__isl_give isl_pw_aff *isl_pw_aff_union_max(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2);
 
 __isl_give isl_pw_aff *isl_pw_aff_copy(__isl_keep isl_pw_aff *pwaff);

diff --git a/isl_aff.c b/isl_aff.c
index b9bd801..284a88a 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -1049,7 +1049,7 @@ __isl_give isl_pw_aff *isl_pw_aff_add_dims(__isl_take isl_pw_aff *pwaff,
  * and pwaff2.  If only one of pwaff1 or pwaff2 is defined on a given
  * cell, then the associated expression is the defined one.
  */
-__isl_give isl_pw_aff *isl_pw_aff_max(__isl_take isl_pw_aff *pwaff1,
+__isl_give isl_pw_aff *isl_pw_aff_union_max(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
        int i, j, n;

diff --git a/isl_map.c b/isl_map.c
index 78534bf..61c695f 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -5134,7 +5134,7 @@ static __isl_give isl_pw_aff *basic_set_dim_max(__isl_keep isl_basic_set *bset)
  *
  * We first project the set onto the given dimension and then compute
  * the "lexicographic" maximum in each basic set, combining the results
- * using isl_pw_aff_max.
+ * using isl_pw_aff_union_max.
  */
 __isl_give isl_pw_aff *isl_set_dim_max(__isl_take isl_set *set, int pos)
 {
@@ -5163,7 +5163,7 @@ __isl_give isl_pw_aff *isl_set_dim_max(__isl_take isl_set *set, int pos)
                isl_pw_aff *pwaff_i;
 
                pwaff_i = basic_set_dim_max(set->p[i]);
-               pwaff = isl_pw_aff_max(pwaff, pwaff_i);
+               pwaff = isl_pw_aff_union_max(pwaff, pwaff_i);
        }
 
        isl_set_free(set);