From 6fec9bc0004352f8a19f4d133da13b941b22087c Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Fri, 13 Apr 2007 01:17:44 +0200 Subject: [PATCH] test_approx: test volume computation variations --- test_approx.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test_approx.c b/test_approx.c index 7b58ceb..6999d07 100644 --- a/test_approx.c +++ b/test_approx.c @@ -12,13 +12,17 @@ struct { } methods[] = { { BV_APPROX_SIGN_NONE, BV_APPROX_NONE, 0 }, { BV_APPROX_SIGN_APPROX, BV_APPROX_DROP, 0 }, -{ BV_APPROX_SIGN_APPROX, BV_APPROX_VOLUME, 0 }, +{ BV_APPROX_SIGN_APPROX, BV_APPROX_VOLUME, BV_VOL_LIFT }, +{ BV_APPROX_SIGN_APPROX, BV_APPROX_VOLUME, BV_VOL_VERTEX }, +{ BV_APPROX_SIGN_APPROX, BV_APPROX_VOLUME, BV_VOL_BARYCENTER }, { BV_APPROX_SIGN_APPROX, BV_APPROX_SCALE, 0 }, { BV_APPROX_SIGN_APPROX, BV_APPROX_SCALE, BV_APPROX_SCALE_CHAMBER }, { BV_APPROX_SIGN_APPROX, BV_APPROX_SCALE, BV_APPROX_SCALE_FAST }, { BV_APPROX_SIGN_APPROX, BV_APPROX_SCALE, BV_APPROX_SCALE_FAST | BV_APPROX_SCALE_CHAMBER }, { BV_APPROX_SIGN_LOWER, BV_APPROX_DROP, 0 }, -{ BV_APPROX_SIGN_LOWER, BV_APPROX_VOLUME, 0 }, +{ BV_APPROX_SIGN_LOWER, BV_APPROX_VOLUME, BV_VOL_LIFT }, +{ BV_APPROX_SIGN_LOWER, BV_APPROX_VOLUME, BV_VOL_VERTEX }, +{ BV_APPROX_SIGN_LOWER, BV_APPROX_VOLUME, BV_VOL_BARYCENTER }, { BV_APPROX_SIGN_LOWER, BV_APPROX_SCALE, 0 }, { BV_APPROX_SIGN_LOWER, BV_APPROX_SCALE, BV_APPROX_SCALE_CHAMBER }, { BV_APPROX_SIGN_LOWER, BV_APPROX_SCALE, BV_APPROX_SCALE_FAST }, @@ -32,7 +36,9 @@ struct { { BV_APPROX_SIGN_LOWER, BV_APPROX_SCALE, BV_APPROX_SCALE_FAST | BV_APPROX_SCALE_NARROW2 }, { BV_APPROX_SIGN_LOWER, BV_APPROX_SCALE, BV_APPROX_SCALE_FAST | BV_APPROX_SCALE_NARROW2 | BV_APPROX_SCALE_CHAMBER }, { BV_APPROX_SIGN_UPPER, BV_APPROX_DROP, 0 }, -{ BV_APPROX_SIGN_UPPER, BV_APPROX_VOLUME, 0 }, +{ BV_APPROX_SIGN_UPPER, BV_APPROX_VOLUME, BV_VOL_LIFT }, +{ BV_APPROX_SIGN_UPPER, BV_APPROX_VOLUME, BV_VOL_VERTEX }, +{ BV_APPROX_SIGN_UPPER, BV_APPROX_VOLUME, BV_VOL_BARYCENTER }, { BV_APPROX_SIGN_UPPER, BV_APPROX_SCALE, 0 }, { BV_APPROX_SIGN_UPPER, BV_APPROX_SCALE, BV_APPROX_SCALE_CHAMBER }, { BV_APPROX_SIGN_UPPER, BV_APPROX_SCALE, BV_APPROX_SCALE_FAST }, @@ -303,7 +309,10 @@ void handle(FILE *in, struct result_data *result, struct verify_options *options struct tms en_cpu; options->barvinok->polynomial_approximation = methods[i].sign; options->barvinok->approximation_method = methods[i].method; - options->barvinok->scale_flags = methods[i].flags; + if (methods[i].method == BV_APPROX_SCALE) + options->barvinok->scale_flags = methods[i].flags; + else if (methods[i].method == BV_APPROX_VOLUME) + options->barvinok->volume_triangulate = methods[i].flags; times(&st_cpu); EP[i] = barvinok_enumerate_with_options(A, C, options->barvinok); -- 2.11.4.GIT