add isl_pw_qpolynomial_pow

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

diff --git a/isl_polynomial.c b/isl_polynomial.c
index ce91581..5a78619 100644 (file)
--- a/isl_polynomial.c
+++ b/isl_polynomial.c
@@ -15,6 +15,7 @@
 #include <isl/lp.h>
 #include <isl/seq.h>
 #include <isl_union_map_private.h>
+#include <isl_constraint_private.h>
 #include <isl_polynomial_private.h>
 #include <isl_point_private.h>
 #include <isl_dim_private.h>
@@ -1470,6 +1471,27 @@ error:
        return NULL;
 }
 
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_pow(
+       __isl_take isl_pw_qpolynomial *pwqp, unsigned power)
+{
+       int i;
+
+       if (power == 1)
+               return pwqp;
+
+       pwqp = isl_pw_qpolynomial_cow(pwqp);
+       if (!pwqp)
+               return NULL;
+
+       for (i = 0; i < pwqp->n; ++i) {
+               pwqp->p[i].qp = isl_qpolynomial_pow(pwqp->p[i].qp, power);
+               if (!pwqp->p[i].qp)
+                       return isl_pw_qpolynomial_free(pwqp);
+       }
+
+       return pwqp;
+}
+
 __isl_give isl_qpolynomial *isl_qpolynomial_zero(__isl_take isl_dim *dim)
 {
        if (!dim)
@@ -2379,7 +2401,7 @@ error:
        return NULL;
 }
 
-__isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities(
+static __isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities_lifted(
        __isl_take isl_qpolynomial *qp, __isl_take isl_basic_set *eq)
 {
        int i, j, k;
@@ -2445,6 +2467,22 @@ error:
        return NULL;
 }
 
+/* Exploit the equalities in "eq" to simplify the quasi-polynomial.
+ */
+__isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities(
+       __isl_take isl_qpolynomial *qp, __isl_take isl_basic_set *eq)
+{
+       if (!qp || !eq)
+               goto error;
+       if (qp->div->n_row > 0)
+               eq = isl_basic_set_add(eq, isl_dim_set, qp->div->n_row);
+       return isl_qpolynomial_substitute_equalities_lifted(qp, eq);
+error:
+       isl_basic_set_free(eq);
+       isl_qpolynomial_free(qp);
+       return NULL;
+}
+
 static __isl_give isl_basic_set *add_div_constraints(
        __isl_take isl_basic_set *bset, __isl_take isl_mat *div)
 {
@@ -2494,13 +2532,30 @@ __isl_give isl_qpolynomial *isl_qpolynomial_gist(
        }
 
        aff = isl_set_affine_hull(context);
-       return isl_qpolynomial_substitute_equalities(qp, aff);
+       return isl_qpolynomial_substitute_equalities_lifted(qp, aff);
 error:
        isl_qpolynomial_free(qp);
        isl_set_free(context);
        return NULL;
 }
 
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_from_qpolynomial(
+       __isl_take isl_qpolynomial *qp)
+{
+       isl_set *dom;
+
+       if (!qp)
+               return NULL;
+       if (isl_qpolynomial_is_zero(qp)) {
+               isl_dim *dim = isl_qpolynomial_get_dim(qp);
+               isl_qpolynomial_free(qp);
+               return isl_pw_qpolynomial_zero(dim);
+       }
+
+       dom = isl_set_universe(isl_qpolynomial_get_dim(qp));
+       return isl_pw_qpolynomial_alloc(dom, qp);
+}
+
 #undef PW
 #define PW isl_pw_qpolynomial
 #undef EL
@@ -2604,40 +2659,6 @@ error:
        return NULL;
 }
 
-__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_neg(
-       __isl_take isl_pw_qpolynomial *pwqp)
-{
-       int i;
-
-       if (!pwqp)
-               return NULL;
-
-       if (isl_pw_qpolynomial_is_zero(pwqp))
-               return pwqp;
-
-       pwqp = isl_pw_qpolynomial_cow(pwqp);
-       if (!pwqp)
-               return NULL;
-
-       for (i = 0; i < pwqp->n; ++i) {
-               pwqp->p[i].qp = isl_qpolynomial_neg(pwqp->p[i].qp);
-               if (!pwqp->p[i].qp)
-                       goto error;
-       }
-
-       return pwqp;
-error:
-       isl_pw_qpolynomial_free(pwqp);
-       return NULL;
-}
-
-__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_sub(
-       __isl_take isl_pw_qpolynomial *pwqp1,
-       __isl_take isl_pw_qpolynomial *pwqp2)
-{
-       return isl_pw_qpolynomial_add(pwqp1, isl_pw_qpolynomial_neg(pwqp2));
-}
-
 __isl_give struct isl_upoly *isl_upoly_eval(
        __isl_take struct isl_upoly *up, __isl_take isl_vec *vec)
 {
@@ -3008,36 +3029,11 @@ error:
 __isl_give isl_qpolynomial *isl_qpolynomial_from_constraint(
        __isl_take isl_constraint *c, enum isl_dim_type type, unsigned pos)
 {
-       isl_int denom;
-       isl_dim *dim;
-       struct isl_upoly *up;
-       isl_qpolynomial *qp;
-       int sgn;
+       isl_aff *aff;
 
-       if (!c)
-               return NULL;
-
-       isl_int_init(denom);
-
-       isl_constraint_get_coefficient(c, type, pos, &denom);
-       isl_constraint_set_coefficient(c, type, pos, c->ctx->zero);
-       sgn = isl_int_sgn(denom);
-       isl_int_abs(denom, denom);
-       up = isl_upoly_from_affine(c->ctx, c->line[0], denom,
-                                       1 + isl_constraint_dim(c, isl_dim_all));
-       if (sgn < 0)
-               isl_int_neg(denom, denom);
-       isl_constraint_set_coefficient(c, type, pos, denom);
-
-       dim = isl_dim_copy(c->bmap->dim);
-
-       isl_int_clear(denom);
+       aff = isl_constraint_get_bound(c, type, pos);
        isl_constraint_free(c);
-
-       qp = isl_qpolynomial_alloc(dim, 0, up);
-       if (sgn > 0)
-               qp = isl_qpolynomial_neg(qp);
-       return qp;
+       return isl_qpolynomial_from_aff(aff);
 }
 
 /* For each 0 <= i < "n", replace variable "first" + i of type "type"