From 8073983de8f6762896e3a56e1fd4a2c2845a7302 Mon Sep 17 00:00:00 2001 From: Cedric Bastoul Date: Tue, 1 Oct 2002 22:06:39 +0100 Subject: [PATCH] piplib 1.01 --- configure.in | 2 +- test/boulet.ll | 268 ++++++++++++++++++++++++++++++++++++++---- test/bouleti.ll | 294 +++++++++++++++++++++++++++++++++++------------ test/crescat.ll | 28 +++++ test/dirk.ll | 28 ++++- test/dirks.ll | 2 - test/discr.ll | 2 + test/makefile | 50 ++++++++ test/max.ll | 7 +- test/test12i.ll | 2 +- test/{test12i.ll => xyz} | 2 +- 11 files changed, 571 insertions(+), 114 deletions(-) create mode 100644 test/crescat.ll delete mode 100644 test/dirks.ll create mode 100644 test/discr.ll create mode 100644 test/makefile copy test/{test12i.ll => xyz} (60%) diff --git a/configure.in b/configure.in index fbcb73b..e54a89e 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl Input file for autoconf to build a configuration shellscript. AC_PREREQ(2.13) AC_INIT(./source/piplib.c) -VERSION="1.0" +VERSION="1.01" dnl /************************************************************************** diff --git a/test/boulet.ll b/test/boulet.ll index 4155705..4d5528d 100644 --- a/test/boulet.ll +++ b/test/boulet.ll @@ -28,44 +28,266 @@ y-y' >= 0, z-z' <= -1 } - en nombres entiers -1 )(if #[ 0 -1 2 0 0 -1 -1] + en nombres entiers -1 )(if #[ 0 0 1 -1 0 0 1] +(if #[ 0 1 0 -1 0 0 1] +(if #[ 0 -3 0 1 1 1 -10] +(if #[ 0 1 0 0 0 -1 2] +(if #[ 0 -9 4 3 -1 3 -6] +(if #[ 0 -2 0 1 0 1 -3] +(if #[ 0 -1 2 0 0 -1 -1] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 0 0 0 0 0 1] +#[ 1 5/4 0 -3/4 1/4 -3/4 3/2] +#[ 1 -2 0 1 0 1 -2] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] ) -(if #[ 0 -9 4 3 -1 -3 6 0] -(if #[ 0 -1 0 0 0 -1 2 0] -(newparm 7 (div #[ 0 3 0 3 3 1 2 0] - 4) +() +) +() +) +() +) +(if #[ 0 -1 2 0 0 -1 0] +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -2 0 1 1 0 -8] +(if #[ 0 -1 0 1 0 0 -1] +(if #[ 0 -6 4 3 -1 0 0] +(list #[ 1 0 0 0 0 0 1] +#[ 1 -2 0 1 1 0 -1] +#[ 1 -1 0 0 0 1 1] +#[ 1 -1/2 0 0 0 1/2 0] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 -1/2 0 1/4 1/4 0 -1] +#[ 1 0 0 0 0 0 1] +) +() +) +() +) +() +) +() +) +() +) +) +() +) +(if #[ 0 1 0 0 0 -1 2] +(if #[ 0 1 0 0 0 -1 1] +(if #[ 0 -6 0 7 -1 0 -4] +() +() +) +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -1 0 2 0 -1 -3] +(if #[ 0 -6 0 7 -1 0 -4] +(if #[ 0 3 2 -7 1 1 0] +(if #[ 0 3 0 -5 1 1 -2] +(if #[ 0 4 0 -7 1 2 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -5/2 0 7/2 -1/2 -1/2 0] +#[ 1 3/2 0 -5/2 1/2 1/2 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() +) +() +) +() +) +(if #[ 0 -9 4 3 -1 3 -6] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 0 0 0 0 0 1] +#[ 1 5/4 0 -3/4 1/4 -3/4 3/2] +#[ 1 -2 0 1 0 1 -2] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() +) +) +(if #[ 0 2 0 -3 1 0 -4] +(if #[ 0 -9 4 3 -1 3 -6] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 0 0 0 0 0 1] +#[ 1 5/4 0 -3/4 1/4 -3/4 3/2] +#[ 1 -2 0 1 0 1 -2] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() +) +() +) +) +() +) +) +(if #[ 0 -1 2 0 0 -1 0] +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -1 0 2 0 -1 -2] +(if #[ 0 -1 0 2 0 -1 -3] +(if #[ 0 -4 0 7 -1 -2 0] +(if #[ 0 3 2 -7 1 1 0] +(if #[ 0 3 0 -5 1 1 -2] +(if #[ 0 4 0 -7 1 2 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -5/2 0 7/2 -1/2 -1/2 0] +#[ 1 3/2 0 -5/2 1/2 1/2 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] ) -(if #[ 0 -6 0 -3 -3 -4 4 4 0] -(newparm 8 (div #[ 0 0 0 0 0 1 2 2 0] - 3) +() +) +() +) +() +) +(if #[ 0 -6 4 3 -1 0 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -1/2 0 0 0 1/2 0] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() +) +) +(if #[ 0 2 0 -3 1 0 -4] +(if #[ 0 -6 4 3 -1 0 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -1/2 0 0 0 1/2 0] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() ) -(newparm 9 (div #[ 0 0 0 0 0 1 0 0 1 0] - 2) +() ) -(newparm 10 (div #[ 0 1 0 0 0 1 0 0 0 0 1] - 2) ) -(newparm 11 (div #[ 0 2 0 3 3 0 0 0 0 0 0 0] - 4) +(if #[ 0 2 0 -3 1 0 -4] +(if #[ 0 -6 4 3 -1 0 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -1/2 0 0 0 1/2 0] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] ) -(list #[ 1 -1 0 1 0 0 0 0 0 0 0 0 0] -#[ 1 -1 0 0 1 0 0 0 0 0 0 0 0] -#[ 1 2 0 3 3 2 0 0 0 0 -2 -4 2] -#[ 1 0 0 0 0 1 -1 0 0 0 0 0 0] -#[ 1 2 0 0 1 3 0 0 0 -3 0 0 0] -#[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0] -#[ 1 0 0 0 0 1 0 0 0 0 -1 0 1] -#[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0] -#[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] +() ) () ) +) () ) () ) +) +) +(if #[ 0 -1 2 -1 0 0 0] +(if #[ 0 1 -2 2 0 -1 0] +(if #[ 0 1 -2 2 0 -1 -1] +(if #[ 0 -6 4 3 -1 0 0] () () +) +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -6 4 3 -1 0 0] +(if #[ 0 3 2 -7 1 1 0] +(if #[ 0 4 0 -7 1 2 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -5/2 0 7/2 -1/2 -1/2 0] +#[ 1 3/2 0 -5/2 1/2 1/2 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) () +) +() +) () ) +() +) +) +(if #[ 0 -1 2 0 0 -1 0] +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -4 0 7 -1 -2 0] +(if #[ 0 3 2 -7 1 1 0] +(if #[ 0 4 0 -7 1 2 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -5/2 0 7/2 -1/2 -1/2 0] +#[ 1 3/2 0 -5/2 1/2 1/2 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() +) +() +) +(if #[ 0 -6 4 3 -1 0 0] +(list #[ 1 -1 0 1 0 0 0] +#[ 1 -1 0 0 1 0 0] +#[ 1 -1 0 0 0 1 1] +#[ 1 -1/2 0 0 0 1/2 0] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +#[ 1 -1/2 0 0 0 1/2 1/2] +#[ 1 1/2 0 -3/4 1/4 0 0] +#[ 1 -1 0 1 0 0 0] +) +() +) +) +() +) +() +) +) +() +) +) +) diff --git a/test/bouleti.ll b/test/bouleti.ll index 6f90a11..5d94493 100644 --- a/test/bouleti.ll +++ b/test/bouleti.ll @@ -28,14 +28,107 @@ y-y' >= 0, z-z' <= -1 } - en nombres entiers -1 )(if #[ 0 -1 2 0 0 -1 -1] -(if #[ 0 0 1 -1 0 0 1] -(if #[ 0 -1 0 0 0 1 -1] -(if #[ 0 -1 0 1 0 0 -2] -(if #[ 0 2 0 -3 1 0 -4] + en nombres entiers -1 )(if #[ 0 0 1 -1 0 0 1] +(if #[ 0 1 0 -1 0 0 1] +(if #[ 0 -3 0 1 1 1 -10] +(if #[ 0 1 0 0 0 -1 2] +(if #[ 0 -9 4 3 -1 3 -6] +(if #[ 0 -2 0 1 0 1 -3] +(if #[ 0 -1 2 0 0 -1 -1] +(newparm 6 (div #[ 0 3 0 3 3 3 2] + 4) +) +(if #[ 0 -9 0 0 -3 0 4 -11] +(newparm 7 (div #[ 0 0 0 0 0 0 2 2] + 3) +) +(newparm 8 (div #[ 0 0 0 0 0 0 0 1 0] + 2) +) +(newparm 9 (div #[ 0 1 0 0 0 1 0 0 0 1] + 2) +) +(newparm 10 (div #[ 0 1 0 0 3 0 0 0 0 0 3] + 4) +) +(list #[ 1 -1 0 1 0 0 0 0 0 0 0 0] +#[ 1 -1 0 0 1 0 0 0 0 0 0 0] +#[ 1 2 0 -1 3 2 0 0 0 -2 -4 6] +#[ 1 0 0 0 0 0 0 0 0 0 0 1] +#[ 1 2 0 0 1 0 0 0 -3 0 0 3] +#[ 1 -3 0 0 -1 0 0 0 4 0 0 -4] +#[ 1 0 0 0 0 1 0 0 0 -1 0 1] +#[ 1 -1 0 0 -2 0 0 0 0 0 3 -3] +#[ 1 1 0 0 3 0 0 0 0 0 -4 4] +) +() +) +() +) +() +) +() +) +(if #[ 0 -1 2 0 0 -1 0] +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -2 0 1 1 0 -8] +(if #[ 0 -1 0 1 0 0 -1] (if #[ 0 -6 4 3 -1 0 0] -(if #[ 0 4 0 -7 1 2 2] +(newparm 6 (div #[ 0 1 0 0 0 1 0] + 2) +) +(if #[ 0 -1 0 0 0 -1 2 0] +(newparm 7 (div #[ 0 3 0 3 3 1 2 0] + 4) +) +(if #[ 0 -9 0 0 -3 -4 4 4 -3] +(newparm 8 (div #[ 0 0 0 0 0 1 2 2 0] + 3) +) +(newparm 9 (div #[ 0 0 0 0 0 1 0 0 1 0] + 2) +) +(newparm 10 (div #[ 0 1 0 0 0 1 0 0 0 0 1] + 2) +) +(newparm 11 (div #[ 0 2 0 3 3 0 0 0 0 0 0 0] + 4) +) +(list #[ 1 0 0 0 0 0 0 0 0 0 0 0 1] +#[ 1 0 0 4 4 0 0 0 0 0 0 -4 -1] +#[ 1 0 0 0 0 2 0 0 0 0 -2 0 2] +#[ 1 0 0 0 0 1 -1 0 0 0 0 0 0] +#[ 1 2 0 0 1 3 0 0 0 -3 0 0 0] +#[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0] +#[ 1 0 0 0 0 1 0 0 0 0 -1 0 1] +#[ 1 0 0 1 1 0 0 0 0 0 0 -1 -1] +#[ 1 0 0 0 0 0 0 0 0 0 0 0 1] +) +() +) +() +) +() +) +() +) +() +) +() +) +() +) +) +() +) (if #[ 0 1 0 0 0 -1 2] +(if #[ 0 1 0 0 0 -1 1] +(if #[ 0 -6 0 7 -1 0 -4] +() +() +) +(if #[ 0 -1 2 0 0 -1 -1] +(if #[ 0 -1 0 2 0 -1 -3] (if #[ 0 -6 0 7 -1 0 -4] (if #[ 0 3 2 -7 1 1 0] (if #[ 0 3 0 -5 1 1 -2] @@ -66,7 +159,6 @@ () ) (if #[ 0 -9 4 3 -1 3 -6] -(if #[ 0 -1 0 0 0 1 -2] (newparm 6 (div #[ 0 3 0 3 3 3 2] 4) ) @@ -97,10 +189,49 @@ ) () ) +) +(if #[ 0 2 0 -3 1 0 -4] +(if #[ 0 -9 4 3 -1 3 -6] +(newparm 6 (div #[ 0 3 0 3 3 3 2] + 4) +) +(if #[ 0 -6 0 -3 -3 0 4 -8] +(newparm 7 (div #[ 0 0 0 0 0 0 2 2] + 3) +) +(newparm 8 (div #[ 0 0 0 0 0 0 0 1 0] + 2) +) +(newparm 9 (div #[ 0 1 0 0 0 1 0 0 0 1] + 2) +) +(newparm 10 (div #[ 0 2 0 3 3 0 0 0 0 0 0] + 4) +) +(list #[ 1 -1 0 1 0 0 0 0 0 0 0 0] +#[ 1 -1 0 0 1 0 0 0 0 0 0 0] +#[ 1 2 0 3 3 2 0 0 0 -2 -4 2] +#[ 1 0 0 0 0 0 0 0 0 0 0 1] +#[ 1 2 0 0 1 0 0 0 -3 0 0 3] +#[ 1 -3 0 0 -1 0 0 0 4 0 0 -4] +#[ 1 0 0 0 0 1 0 0 0 -1 0 1] +#[ 1 -1 0 -3 -2 0 0 0 0 0 3 0] +#[ 1 1 0 4 3 0 0 0 0 0 -4 0] +) +() +) +() +) +() +) +) () ) ) +(if #[ 0 -1 2 0 0 -1 0] +(if #[ 0 -1 2 0 0 -1 -1] (if #[ 0 -1 0 2 0 -1 -2] +(if #[ 0 -1 0 2 0 -1 -3] (if #[ 0 -4 0 7 -1 -2 0] (if #[ 0 3 2 -7 1 1 0] (if #[ 0 3 0 -5 1 1 -2] @@ -133,10 +264,10 @@ ) () ) +(if #[ 0 -6 4 3 -1 0 0] (newparm 6 (div #[ 0 1 0 0 0 1 0] 2) ) -(if #[ 0 -9 4 3 -1 -3 6 0] (if #[ 0 -1 0 0 0 -1 2 0] (newparm 7 (div #[ 0 3 0 3 3 1 2 0] 4) @@ -154,9 +285,11 @@ (newparm 11 (div #[ 0 2 0 3 3 0 0 0 0 0 0 0] 4) ) -(list #[ 1 -1 0 1 0 0 0 0 0 0 0 0 0] +(if #[ 0 -2 0 -3 -3 0 0 0 0 0 0 4 0] +(if #[ 0 1 0 0 0 1 0 0 0 0 -2 0 1] +(list #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] #[ 1 -1 0 0 1 0 0 0 0 0 0 0 0] -#[ 1 2 0 3 3 2 0 0 0 0 -2 -4 2] +#[ 1 0 0 0 0 2 0 0 0 0 -2 0 2] #[ 1 0 0 0 0 1 -1 0 0 0 0 0 0] #[ 1 2 0 0 1 3 0 0 0 -3 0 0 0] #[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0] @@ -164,6 +297,22 @@ #[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0] #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] ) +(newparm 12 (div #[ 0 1 0 0 0 1 0 0 0 0 0 0 1] + 2) +) +(list #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0 0] +#[ 1 -1 0 0 1 0 0 0 0 0 0 0 0 0] +#[ 1 0 0 0 0 2 0 0 0 0 0 0 -2 2] +#[ 1 0 0 0 0 1 -1 0 0 0 0 0 0 0] +#[ 1 2 0 0 1 3 0 0 0 -3 0 0 0 0] +#[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0 0] +#[ 1 0 0 0 0 1 0 0 0 0 0 0 -1 1] +#[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0 0] +#[ 1 1 0 4 3 0 0 0 0 0 0 -4 0 0] +) +) +() +) () ) () @@ -171,11 +320,11 @@ () ) ) +(if #[ 0 2 0 -3 1 0 -4] +(if #[ 0 -6 4 3 -1 0 0] (newparm 6 (div #[ 0 1 0 0 0 1 0] 2) ) -(if #[ 0 -9 4 3 -1 -3 6 0] -(if #[ 0 -1 0 0 0 -1 2 0] (newparm 7 (div #[ 0 3 0 3 3 1 2 0] 4) ) @@ -209,59 +358,11 @@ () ) ) -) -() -) -() -) -() -) -(if #[ 0 -3 0 1 1 1 -10] -(if #[ 0 1 0 0 0 -1 2] -(if #[ 0 -9 4 3 -1 3 -6] -(if #[ 0 -1 0 0 0 1 -2] -(if #[ 0 -1 0 1 0 0 -1] -(newparm 6 (div #[ 0 3 0 3 3 3 2] - 4) -) -(if #[ 0 -6 0 -3 -3 0 4 -8] -(newparm 7 (div #[ 0 0 0 0 0 0 2 2] - 3) -) -(newparm 8 (div #[ 0 0 0 0 0 0 0 1 0] - 2) -) -(newparm 9 (div #[ 0 1 0 0 0 1 0 0 0 1] - 2) -) -(newparm 10 (div #[ 0 2 0 3 3 0 0 0 0 0 0] - 4) -) -(list #[ 1 0 0 0 0 0 0 0 0 0 0 1] -#[ 1 0 0 4 4 0 0 0 0 0 -4 -1] -#[ 1 0 0 0 0 2 0 0 0 -2 0 2] -#[ 1 0 0 0 0 0 0 0 0 0 0 1] -#[ 1 2 0 0 1 0 0 0 -3 0 0 3] -#[ 1 -3 0 0 -1 0 0 0 4 0 0 -4] -#[ 1 0 0 0 0 1 0 0 0 -1 0 1] -#[ 1 0 0 1 1 0 0 0 0 0 -1 -1] -#[ 1 0 0 0 0 0 0 0 0 0 0 1] -) -() -) -() -) -() -) -() -) -(if #[ 0 -2 0 1 1 0 -8] +(if #[ 0 2 0 -3 1 0 -4] (if #[ 0 -6 4 3 -1 0 0] -(if #[ 0 -1 0 1 0 0 -1] (newparm 6 (div #[ 0 1 0 0 0 1 0] 2) ) -(if #[ 0 -9 4 3 -1 -3 6 0] (if #[ 0 -1 0 0 0 -1 2 0] (newparm 7 (div #[ 0 3 0 3 3 1 2 0] 4) @@ -279,15 +380,32 @@ (newparm 11 (div #[ 0 2 0 3 3 0 0 0 0 0 0 0] 4) ) -(list #[ 1 0 0 0 0 0 0 0 0 0 0 0 1] -#[ 1 0 0 4 4 0 0 0 0 0 0 -4 -1] +(if #[ 0 -2 0 -3 -3 0 0 0 0 0 0 4 0] +(if #[ 0 -1 0 -3 -2 0 0 0 0 0 0 3 -1] +(if #[ 0 1 0 0 0 1 0 0 0 0 -2 0 1] +(list #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] +#[ 1 -1 0 0 1 0 0 0 0 0 0 0 0] #[ 1 0 0 0 0 2 0 0 0 0 -2 0 2] #[ 1 0 0 0 0 1 -1 0 0 0 0 0 0] #[ 1 2 0 0 1 3 0 0 0 -3 0 0 0] #[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0] #[ 1 0 0 0 0 1 0 0 0 0 -1 0 1] -#[ 1 0 0 1 1 0 0 0 0 0 0 -1 -1] -#[ 1 0 0 0 0 0 0 0 0 0 0 0 1] +#[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0] +#[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] +) +(newparm 12 (div #[ 0 1 0 0 0 1 0 0 0 0 0 0 1] + 2) +) +(list #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0 0] +#[ 1 -1 0 0 1 0 0 0 0 0 0 0 0 0] +#[ 1 0 0 0 0 2 0 0 0 0 0 0 -2 2] +#[ 1 0 0 0 0 1 -1 0 0 0 0 0 0 0] +#[ 1 2 0 0 1 3 0 0 0 -3 0 0 0 0] +#[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0 0] +#[ 1 0 0 0 0 1 0 0 0 0 0 0 -1 1] +#[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0 0] +#[ 1 1 0 4 3 0 0 0 0 0 0 -4 0 0] +) ) () ) @@ -304,15 +422,20 @@ ) () ) -) () ) +) +) (if #[ 0 -1 2 -1 0 0 0] -(if #[ 0 -1 2 -2 0 1 1] (if #[ 0 1 -2 2 0 -1 0] -(if #[ 0 -4 0 7 -1 -2 -2] +(if #[ 0 1 -2 2 0 -1 -1] +(if #[ 0 -6 4 3 -1 0 0] +() () +) +(if #[ 0 -1 2 0 0 -1 -1] (if #[ 0 -6 4 3 -1 0 0] +(if #[ 0 3 2 -7 1 1 0] (if #[ 0 4 0 -7 1 2 0] (newparm 6 (div #[ 0 1 0 1 1 1 0] 2) @@ -337,11 +460,15 @@ ) () ) +() ) -(if #[ 0 -4 0 7 -1 -2 -2] () -(if #[ 0 -6 4 3 -1 0 0] +) +) +(if #[ 0 -1 2 0 0 -1 0] +(if #[ 0 -1 2 0 0 -1 -1] (if #[ 0 -4 0 7 -1 -2 0] +(if #[ 0 3 2 -7 1 1 0] (if #[ 0 4 0 -7 1 2 0] (newparm 6 (div #[ 0 1 0 1 1 1 0] 2) @@ -367,10 +494,12 @@ ) () ) +() +) +(if #[ 0 -6 4 3 -1 0 0] (newparm 6 (div #[ 0 1 0 0 0 1 0] 2) ) -(if #[ 0 -9 4 3 -1 -3 6 0] (if #[ 0 -1 0 0 0 -1 2 0] (newparm 7 (div #[ 0 3 0 3 3 1 2 0] 4) @@ -388,9 +517,11 @@ (newparm 11 (div #[ 0 2 0 3 3 0 0 0 0 0 0 0] 4) ) -(list #[ 1 -1 0 1 0 0 0 0 0 0 0 0 0] +(if #[ 0 -2 0 -3 -3 0 0 0 0 0 0 4 0] +(if #[ 0 1 0 0 0 1 0 0 0 0 -2 0 1] +(list #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] #[ 1 -1 0 0 1 0 0 0 0 0 0 0 0] -#[ 1 2 0 3 3 2 0 0 0 0 -2 -4 2] +#[ 1 0 0 0 0 2 0 0 0 0 -2 0 2] #[ 1 0 0 0 0 1 -1 0 0 0 0 0 0] #[ 1 2 0 0 1 3 0 0 0 -3 0 0 0] #[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0] @@ -398,15 +529,27 @@ #[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0] #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0] ) -() +(newparm 12 (div #[ 0 1 0 0 0 1 0 0 0 0 0 0 1] + 2) +) +(list #[ 1 1 0 4 3 0 0 0 0 0 0 -4 0 0] +#[ 1 -1 0 0 1 0 0 0 0 0 0 0 0 0] +#[ 1 0 0 0 0 2 0 0 0 0 0 0 -2 2] +#[ 1 0 0 0 0 1 -1 0 0 0 0 0 0 0] +#[ 1 2 0 0 1 3 0 0 0 -3 0 0 0 0] +#[ 1 -3 0 0 -1 -4 0 0 0 4 0 0 0 0] +#[ 1 0 0 0 0 1 0 0 0 0 0 0 -1 1] +#[ 1 -1 0 -3 -2 0 0 0 0 0 0 3 0 0] +#[ 1 1 0 4 3 0 0 0 0 0 0 -4 0 0] ) -() ) () ) +() ) () ) +() ) ) () @@ -417,3 +560,4 @@ () ) ) +) diff --git a/test/crescat.ll b/test/crescat.ll new file mode 100644 index 0000000..6993a68 --- /dev/null +++ b/test/crescat.ll @@ -0,0 +1,28 @@ +((( a b c d e f g h i j k l m n o p q r s t u v w x y z 1)() 1 )(list #[ 2] +#[ 1] +#[ 3] +#[ 3] +#[ 20] +#[ 100] +#[ 617] +#[ 4410] +#[ 35773] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +#[ 0] +) +) diff --git a/test/dirk.ll b/test/dirk.ll index b48c861..87ff7cf 100644 --- a/test/dirk.ll +++ b/test/dirk.ll @@ -1,7 +1,16 @@ -(((i j 1)(m n) -1 )(if #[ -4 0 5] -(if #[ 0 -4 3] +(((i j 1)(m n) -1 )(if #[ 0 -4 3] +(if #[ -4 0 5] () +(if #[ -1 0 3] +(if #[ -1 0 2] +() +() +) +() +) +) (if #[ 0 -2 9] +(if #[ -6 -2 9] (if #[ 0 -2 3] (newparm 2 (div #[ 0 2 3] 6) @@ -24,17 +33,26 @@ () ) ) +(if #[ -6 -2 17] +(if #[ -3 5 0] +(if #[ 6 -2 -3] () +(if #[ 0 -2 7] +(newparm 2 (div #[ 0 4 3] + 6) ) +(if #[ 0 -8 6 11] +() +() ) -(if #[ -1 0 3] -(if #[ -1 0 2] -(if #[ 10 -2 -15] () +) +) () ) () ) +) () ) ) diff --git a/test/dirks.ll b/test/dirks.ll deleted file mode 100644 index b8a13f6..0000000 --- a/test/dirks.ll +++ /dev/null @@ -1,2 +0,0 @@ -(((i j 1)(m n) -1 )() -) diff --git a/test/discr.ll b/test/discr.ll new file mode 100644 index 0000000..a1ee560 --- /dev/null +++ b/test/discr.ll @@ -0,0 +1,2 @@ +((un discriminant de Newpip -1 )() +) diff --git a/test/makefile b/test/makefile new file mode 100644 index 0000000..0fb4360 --- /dev/null +++ b/test/makefile @@ -0,0 +1,50 @@ +# +# Copyright 2002 (c) Leiden University, LIACS, +# All Rights Reserved. +# +# Permission is granted to copy, use, and distribute +# for any commercial or noncommercial purpose under the terms +# of the GNU General Public license, version 2, June 1991 +# (see file : LICENSING). +# +# @author: Bart Kienhuis +# $Id: makefile,v 1.26 2002/09/26 13:03:53 kienhuis Exp $ +# + +ROOT = .. + +# pbs with boulet bouleti and kirk +PIPTEST = \ + crescat.dat \ + discr.dat \ + invert.dat \ + lineri.dat \ + loz.dat \ + maxb.dat \ + max.dat \ + test12i.dat + +BITS = 64 + +test: + failedtest=0; \ + for x in $(PIPTEST) ; do \ + echo "Verify file $$x" ; \ + $(ROOT)/obj$(BITS)_$(TARGET)/pip$(BITS)$(EXEC_SUFFIX) -z < $$x > xyz ;\ + diff -w xyz `basename $$x .dat`.ll ; \ + result=$$?; \ + if [ "$$result" -eq "1" ]; then \ + echo "Error: $$x is not the same"; \ + failedtest=`expr $$failedtest + 1`; \ + else \ + echo "$$x passed"; \ + fi; \ + done ; \ + if [ $$failedtest != 0 ]; then \ + echo "$$failedtest tests failed"; \ + else \ + echo "Test pip works correctly"; \ + fi + +# Include the shared compilation rules +include $(ROOT)/Makefile diff --git a/test/max.ll b/test/max.ll index 205ce06..d85fe1c 100644 --- a/test/max.ll +++ b/test/max.ll @@ -1,5 +1,4 @@ -((a maximization problem 1 )(if #[ -1 6] -(if #[ -1 3] +((a maximization problem 1 )(if #[ -1 3] (list #[ 0 0] #[ 0 0] ) @@ -15,8 +14,4 @@ ) ) ) -(list #[ 1 -4] -#[ 1 -5] -) -) ) diff --git a/test/test12i.ll b/test/test12i.ll index 0ecb1a6..a76d6a6 100644 --- a/test/test12i.ll +++ b/test/test12i.ll @@ -1,4 +1,4 @@ -((variables : a b c d ...., pas de parametres 15120 )(list #[ 2] +((variables : a b c d ...., pas de parametres 1 )(list #[ 2] #[ 1] #[ 1] #[ 5] diff --git a/test/test12i.ll b/test/xyz similarity index 60% copy from test/test12i.ll copy to test/xyz index 0ecb1a6..a76d6a6 100644 --- a/test/test12i.ll +++ b/test/xyz @@ -1,4 +1,4 @@ -((variables : a b c d ...., pas de parametres 15120 )(list #[ 2] +((variables : a b c d ...., pas de parametres 1 )(list #[ 2] #[ 1] #[ 1] #[ 5] -- 2.11.4.GIT