Merge branch 'maint'

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

diff --git a/pip.c b/pip.c
index 1053eff..7977431 100644 (file)
--- a/pip.c
+++ b/pip.c
@@ -9,13 +9,13 @@
 
 #include <assert.h>
 #include <string.h>
-#include "isl_set.h"
+#include <isl_map_private.h>
+#include <isl/set.h>
 #include "isl_tab.h"
-#include "isl_map_private.h"
 #include "isl_sample.h"
 #include "isl_scan.h"
-#include "isl_seq.h"
-#include "isl_ilp.h"
+#include <isl/seq.h>
+#include <isl/ilp.h>
 #include <isl_point_private.h>
 
 /* The input of this program is the same as that of the "example" program
@@ -72,15 +72,8 @@ static __isl_give isl_basic_set *set_bounds(__isl_take isl_basic_set *bset)
 
 static struct isl_basic_set *to_parameter_domain(struct isl_basic_set *context)
 {
-       struct isl_dim *param_dim;
-       struct isl_basic_set *model;
-
-       param_dim = isl_dim_set_alloc(context->ctx,
-                                       isl_basic_set_n_dim(context), 0);
-       model = isl_basic_set_empty(param_dim);
-       context = isl_basic_set_from_underlying_set(context, model);
-
-       return context;
+       return isl_basic_set_move_dims(context, isl_dim_param, 0, isl_dim_set, 0,
+                                      isl_basic_set_dim(context, isl_dim_set));
 }
 
 isl_basic_set *plug_in_parameters(isl_basic_set *bset, struct isl_vec *params)
@@ -129,7 +122,7 @@ struct isl_vec *opt_at(struct isl_basic_set *bset,
 
        bset = plug_in_parameters(bset, params);
 
-       if (isl_basic_set_fast_is_empty(bset)) {
+       if (isl_basic_set_plain_is_empty(bset)) {
                opt = isl_vec_alloc(bset->ctx, 0);
                isl_basic_set_free(bset);
                return opt;
@@ -194,6 +187,8 @@ static int scan_one(struct isl_scan_callback *callback,
        struct isl_scan_pip *sp = (struct isl_scan_pip *)callback;
        struct isl_vec *opt;
 
+       sp->n--;
+
        opt = opt_at(isl_basic_set_copy(sp->bset), isl_vec_copy(sample), sp->max);
        assert(opt);
 
@@ -213,62 +208,50 @@ static int scan_one(struct isl_scan_callback *callback,
                isl_set_free(opt_set);
        }
 
-       if (!(sp->n++ % sp->stride)) {
+       if (!(sp->n % sp->stride)) {
                printf("o");
                fflush(stdout);
        }
 
-       return 0;
-}
-
-struct isl_scan_count {
-       struct isl_scan_callback callback;
-       int n;
-};
-
-static int count_one(struct isl_scan_callback *callback,
-       __isl_take isl_vec *sample)
-{
-       struct isl_scan_count *sc = (struct isl_scan_count *)callback;
-       isl_vec_free(sample);
-
-       sc->n++;
-
-       return 0;
+       return sp->n >= 1 ? 0 : -1;
 }
 
 static void check_solution(isl_basic_set *bset, isl_basic_set *context,
        isl_set *sol, isl_set *empty, int max)
 {
-       struct isl_scan_count sc;
        struct isl_scan_pip sp;
-       int i;
+       isl_int count, count_max;
+       int i, n;
        int r;
 
        context = set_bounds(context);
        context = isl_basic_set_underlying_set(context);
 
-       sc.callback.add = count_one;
-       sc.n = 0;
+       isl_int_init(count);
+       isl_int_init(count_max);
+
+       isl_int_set_si(count_max, 2000);
+       r = isl_basic_set_count_upto(context, count_max, &count);
+       assert(r >= 0);
+       n = isl_int_get_si(count);
 
-       r = isl_basic_set_scan(isl_basic_set_copy(context), &sc.callback);
-       assert (r == 0);
+       isl_int_clear(count_max);
+       isl_int_clear(count);
 
        sp.callback.add = scan_one;
        sp.bset = bset;
        sp.sol = sol;
        sp.empty = empty;
-       sp.n = 0;
-       sp.stride = sc.n > 70 ? 1 + (sc.n + 1)/70 : 1;
+       sp.n = n;
+       sp.stride = n > 70 ? 1 + (n + 1)/70 : 1;
        sp.max = max;
 
-       for (i = 0; i < sc.n; i += sp.stride)
+       for (i = 0; i < n; i += sp.stride)
                printf(".");
        printf("\r");
        fflush(stdout);
 
-       r = isl_basic_set_scan(context, &sp.callback);
-       assert(r == 0);
+       isl_basic_set_scan(context, &sp.callback);
 
        printf("\n");