fix parameter alignment when alignee has zero parameters

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

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 75b0286..b355cda 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -10,7 +10,7 @@
 #include "isl_lp.h"
 #include "isl_map.h"
 #include "isl_map_private.h"
-#include "isl_mat.h"
+#include <isl_mat_private.h>
 #include "isl_set.h"
 #include "isl_seq.h"
 #include "isl_equalities.h"
@@ -427,6 +427,7 @@ isl_int *isl_set_wrap_facet(__isl_keep isl_set *set,
        if (res == isl_lp_ok) {
                isl_int_neg(num, num);
                isl_seq_combine(facet, num, facet, den, ridge, dim);
+               isl_seq_normalize(ctx, facet, dim);
        }
        isl_int_clear(num);
        isl_int_clear(den);
@@ -898,6 +899,25 @@ int isl_basic_set_is_bounded(__isl_keep isl_basic_set *bset)
        return bounded;
 }
 
+/* Is the image bounded for each value of the parameters and
+ * the domain variables?
+ */
+int isl_basic_map_image_is_bounded(__isl_keep isl_basic_map *bmap)
+{
+       unsigned nparam = isl_basic_map_dim(bmap, isl_dim_param);
+       unsigned n_in = isl_basic_map_dim(bmap, isl_dim_in);
+       int bounded;
+
+       bmap = isl_basic_map_copy(bmap);
+       bmap = isl_basic_map_cow(bmap);
+       bmap = isl_basic_map_move_dims(bmap, isl_dim_param, nparam,
+                                       isl_dim_in, 0, n_in);
+       bounded = isl_basic_set_is_bounded((isl_basic_set *)bmap);
+       isl_basic_map_free(bmap);
+
+       return bounded;
+}
+
 /* Is the set bounded for each value of the parameters?
  */
 int isl_set_is_bounded(__isl_keep isl_set *set)
@@ -1074,23 +1094,25 @@ static struct isl_basic_set *valid_direction_lp(
                if (k < 0)
                        goto error;
                n = 0;
-               isl_int_set_si(lp->eq[k][n++], 0);
+               isl_int_set_si(lp->eq[k][n], 0); n++;
                /* positivity constraint 1 >= 0 */
-               isl_int_set_si(lp->eq[k][n++], i == 0);
+               isl_int_set_si(lp->eq[k][n], i == 0); n++;
                for (j = 0; j < bset1->n_eq; ++j) {
-                       isl_int_set(lp->eq[k][n++], bset1->eq[j][i]);
-                       isl_int_neg(lp->eq[k][n++], bset1->eq[j][i]);
+                       isl_int_set(lp->eq[k][n], bset1->eq[j][i]); n++;
+                       isl_int_neg(lp->eq[k][n], bset1->eq[j][i]); n++;
+               }
+               for (j = 0; j < bset1->n_ineq; ++j) {
+                       isl_int_set(lp->eq[k][n], bset1->ineq[j][i]); n++;
                }
-               for (j = 0; j < bset1->n_ineq; ++j)
-                       isl_int_set(lp->eq[k][n++], bset1->ineq[j][i]);
                /* positivity constraint 1 >= 0 */
-               isl_int_set_si(lp->eq[k][n++], -(i == 0));
+               isl_int_set_si(lp->eq[k][n], -(i == 0)); n++;
                for (j = 0; j < bset2->n_eq; ++j) {
-                       isl_int_neg(lp->eq[k][n++], bset2->eq[j][i]);
-                       isl_int_set(lp->eq[k][n++], bset2->eq[j][i]);
+                       isl_int_neg(lp->eq[k][n], bset2->eq[j][i]); n++;
+                       isl_int_set(lp->eq[k][n], bset2->eq[j][i]); n++;
+               }
+               for (j = 0; j < bset2->n_ineq; ++j) {
+                       isl_int_neg(lp->eq[k][n], bset2->ineq[j][i]); n++;
                }
-               for (j = 0; j < bset2->n_ineq; ++j)
-                       isl_int_neg(lp->eq[k][n++], bset2->ineq[j][i]);
        }
        lp = isl_basic_set_gauss(lp, NULL);
        isl_basic_set_free(bset1);
@@ -1150,7 +1172,7 @@ static struct isl_vec *valid_direction(
        isl_seq_clr(dir->block.data + 1, dir->size - 1);
        n = 1;
        /* positivity constraint 1 >= 0 */
-       isl_int_set(dir->block.data[0], sample->block.data[n++]);
+       isl_int_set(dir->block.data[0], sample->block.data[n]); n++;
        for (i = 0; i < bset1->n_eq; ++i) {
                isl_int_sub(sample->block.data[n],
                            sample->block.data[n], sample->block.data[n+1]);