From 61cac77f8251d3a4bbe8ed6657ae030c45e99dda Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Sat, 2 Oct 2010 15:49:56 +0200
Subject: [PATCH] use isl to perform "manual_count"

---
 util.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/util.c b/util.c
index aac3c97..a45dc51 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <assert.h>
+#include <isl_set_polylib.h>
 #include <barvinok/util.h>
 #include <barvinok/options.h>
 #include <polylib/ranking.h>
@@ -17,14 +18,25 @@
 
 void manual_count(Polyhedron *P, Value* result)
 {
-    Polyhedron *U = Universe_Polyhedron(0);
-    Enumeration *en = Polyhedron_Enumerate(P,U,1024,NULL);
-    Value *v = compute_poly(en,NULL);
-    value_assign(*result, *v);
-    value_clear(*v);
-    free(v);
-    Enumeration_Free(en);
-    Polyhedron_Free(U);
+	isl_ctx *ctx = isl_ctx_alloc();
+	isl_dim *dim;
+	isl_set *set;
+	isl_int v;
+	int nvar = P->Dimension;
+	int r;
+
+	dim = isl_dim_set_alloc(ctx, 0, nvar);
+	set = isl_set_new_from_polylib(P, dim);
+
+	isl_int_init(v);
+	r = isl_set_count(set, &v);
+	isl_int_get_gmp(v, *result);
+	isl_int_clear(v);
+
+	isl_set_free(set);
+	isl_ctx_free(ctx);
+
+	assert(r >= 0);
 }
 
 #include <barvinok/evalue.h>
-- 
2.11.4.GIT