Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lrslib for openSUSE:Factory checked in at 2021-11-03 17:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lrslib (Old) and /work/SRC/openSUSE:Factory/.lrslib.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lrslib" Wed Nov 3 17:25:41 2021 rev:7 rq:928856 version:7.1b Changes: -------- --- /work/SRC/openSUSE:Factory/lrslib/lrslib.changes 2020-12-28 10:31:29.649740560 +0100 +++ /work/SRC/openSUSE:Factory/.lrslib.new.1890/lrslib.changes 2021-11-03 17:26:38.733349682 +0100 @@ -1,0 +2,7 @@ +Fri Jun 25 14:53:50 UTC 2021 - Jan Engelhardt <[email protected]> + +- Update to release 7.1b + * Fixed an issue where output can be lost in arithmetic change. + * Place lrsrestart.h into buildroot upon `make install`. + +------------------------------------------------------------------- Old: ---- lrslib-071a.tar.gz New: ---- lrslib-071b.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lrslib.spec ++++++ --- /var/tmp/diff_new_pack.DiMXhZ/_old 2021-11-03 17:26:39.189349931 +0100 +++ /var/tmp/diff_new_pack.DiMXhZ/_new 2021-11-03 17:26:39.189349931 +0100 @@ -1,7 +1,7 @@ # # spec file for package lrslib # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define dullver 071a +%define dullver 071b %define dullver2 071 %define lname liblrs1 Name: lrslib -Version: 7.1a +Version: 7.1b Release: 0 Summary: Reverse Search Vertex Enumeration program License: GPL-2.0-or-later @@ -73,8 +73,8 @@ %autosetup -n %name-%dullver -p1 %build -make CFLAGS="%optflags" CXXFLAGS="%optflags" \ - PACKAGE_VERSION="%version" all-shared %{?_smp_mflags} +%make_build CFLAGS="%optflags" CXXFLAGS="%optflags" \ + PACKAGE_VERSION="%version" all-shared %install %make_install prefix="%_prefix" PACKAGE_VERSION="%version" ++++++ lrs-128.diff ++++++ --- /var/tmp/diff_new_pack.DiMXhZ/_old 2021-11-03 17:26:39.209349942 +0100 +++ /var/tmp/diff_new_pack.DiMXhZ/_new 2021-11-03 17:26:39.209349942 +0100 @@ -1,28 +1,43 @@ +From: Jan Engelhardt <[email protected]> + +A number of platforms do not even have __int128 (e.g. i586). Disable it hard. + +[ 15s] lrslong.h:191:9: error: '__int128' is not supported on this target +[ 15s] 191 | typedef __int128 lrs_mp[1]; /* type lrs_mp holds one 128-bit integer */ +[ 15s] | ^~~~~~~~ + --- - makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + makefile | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) -Index: lrslib-071/makefile +Index: lrslib-071b/makefile =================================================================== ---- lrslib-071.orig/makefile -+++ lrslib-071/makefile -@@ -186,7 +186,7 @@ SOMINOR ?=.0.0 +--- lrslib-071b.orig/makefile ++++ lrslib-071b/makefile +@@ -213,11 +213,13 @@ SOMINOR ?=.0.0 SHLIB ?=$(SONAME)$(SOMINOR) SHLINK ?=liblrs.so --SHLIBOBJ=lrslong1-shr.o lrslong2-shr.o lrslib1-shr.o lrslib2-shr.o \ -+SHLIBOBJ=lrslong1-shr.o lrslib1-shr.o \ - lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o - - SHLIBBIN=lrs-shared lrsnash-shared -@@ -206,8 +206,8 @@ ${SHLINK}: ${SONAME} ++ifeq (${HAVE_INT128},1) + SHLIBOBJ2=lrslib2-shr.o lrslong2-shr.o +- +-# for 32 bit machines +- +-# SHLIBOBJ2= ++XCORE := lrs.o ++else ++SHLIBOBJ2= ++XCORE := lrs64.o ++endif + + SHLIBOBJ=lrslong1-shr.o lrslib1-shr.o \ + lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o \ +@@ -240,7 +242,7 @@ ${SHLINK}: ${SONAME} all-shared: ${SHLIBBIN} --lrs-shared: ${SHLINK} lrs.o -- $(CC) lrs.o -o $@ -L . -llrs -+lrs-shared: ${SHLINK} lrs64.o -+ ${CC} lrs64.o -o $@ -L . -llrs +-lrs-shared: ${SHLINK} lrs-shared.o ++lrs-shared: ${SHLINK} ${XCORE} + $(CC) $^ -o $@ -L . -llrs - lrsnash-shared: ${SHLINK} lrsnash.c ++++++ lrslib-071a.tar.gz -> lrslib-071b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/README new/lrslib-071b/README --- old/lrslib-071a/README 2020-10-17 08:18:46.000000000 +0200 +++ new/lrslib-071b/README 2021-06-04 09:27:57.000000000 +0200 @@ -5,9 +5,28 @@ http://cgm.cs.mcgill.ca/~avis/C/lrs.html ----------------------------------------------------------------------------- -Version 7.1 +Version 7.1b manual: http://cgm.cs.mcgill.ca/~avis/C/lrslib/USERGUIDE71.html +2021.6.02 +Added patches 1,2, and 4 supplied by the Julia group: +https://github.com/JuliaPackaging/Yggdrasil/tree/master/L/lrslib/bundled/patches + +no128bit.patch removes 128-bit support and was not used. + +2021.6.01 makefile updates + +install lrsrestart.h in install-common (thanks to Philipp-Joachim Ost for the report). +Update makefile to ease building on 32 bit architectures. + +2021.5.19 +redund bug reported by Eric Petersen where output can be lost in arithmetic change +Fixed around l. 6367 + +-------------------------------------------------------------------------------- + +Version 7.1 + 2020.10.17 Memory leak in countonly option fixed for mplrs/lrs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/cube.ine new/lrslib-071b/cube.ine --- old/lrslib-071a/cube.ine 2020-10-17 08:18:46.000000000 +0200 +++ new/lrslib-071b/cube.ine 2021-05-19 07:45:03.000000000 +0200 @@ -9,3 +9,4 @@ 1 0 0 -1 1 0 -1 0 end +printcobasis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/ine/redund/ep.ine new/lrslib-071b/ine/redund/ep.ine --- old/lrslib-071a/ine/redund/ep.ine 1970-01-01 01:00:00.000000000 +0100 +++ new/lrslib-071b/ine/redund/ep.ine 2021-06-04 09:22:48.000000000 +0200 @@ -0,0 +1,23 @@ +ep +H-representation +begin +17 4 rational +0 1 -1 0 +0 0 1 -1 +0 1 1 2 +1 -2 0 2 +691 -1562 -1562 -1562 +0 1 0 -1 +2/11 0 0 -1 +17/142 1/2 1/2 -1 +37/142 0 0 0 +691/1562 -1 0 0 +27/71 -1/2 1/2 0 +2/11 1 1 1 +4/11 0 1 1 +471/1562 1/2 3/2 1 +2/11 1 -1 -1 +4/11 0 -1 -1 +471/1562 1/2 -1/2 -1 +end +redund 0 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/ine/redund/mp5a.ine new/lrslib-071b/ine/redund/mp5a.ine --- old/lrslib-071a/ine/redund/mp5a.ine 2020-10-17 08:18:45.000000000 +0200 +++ new/lrslib-071b/ine/redund/mp5a.ine 2021-05-19 07:45:03.000000000 +0200 @@ -46,3 +46,4 @@ 4 0 -2 -1 -1 0 0 0 -1 -1 0 end redund 1 40 +verbose diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/ine/test-062/cp6.ine new/lrslib-071b/ine/test-062/cp6.ine --- old/lrslib-071a/ine/test-062/cp6.ine 2020-10-17 08:18:45.000000000 +0200 +++ new/lrslib-071b/ine/test-062/cp6.ine 1970-01-01 01:00:00.000000000 +0100 @@ -1,374 +0,0 @@ -cp6.ine -*6 point cut polytope -H-representation -begin -368 16 integer - 2 0 1 1 1 1 0 0 0 0 -1 -1 -1 -1 -1 -1 - 2 1 0 1 1 1 0 -1 -1 -1 0 0 0 -1 -1 -1 - 2 1 1 0 1 1 -1 0 -1 -1 0 -1 -1 0 0 -1 - 0 1 0 0 1 0 0 0 -1 0 0 0 0 0 0 0 - 0 1 0 0 0 1 0 0 0 -1 0 0 0 0 0 0 - 0 0 1 0 1 0 0 0 0 0 0 -1 0 0 0 0 - 0 0 1 0 0 1 0 0 0 0 0 0 -1 0 0 0 - 0 0 0 1 1 0 0 0 0 0 0 0 0 -1 0 0 - 0 0 0 1 0 1 0 0 0 0 0 0 0 0 -1 0 - 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 -1 - 2 2 2 2 2 2 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 - 0 0 1 1 0 0 0 0 0 0 -1 0 0 0 0 0 - 0 -1 1 0 0 0 1 0 0 0 0 0 0 0 0 0 - 0 -2 2 2 2 2 1 1 1 1 -1 -1 -1 -1 -1 -1 - 0 -2 1 1 1 1 2 2 2 2 -1 -1 -1 -1 -1 -1 - 0 1 -1 2 -1 -1 1 -2 1 1 2 -1 -1 2 2 -1 - 0 1 -1 -1 2 -1 1 1 -2 1 -1 2 -1 2 -1 2 - 2 -2 1 1 -1 -1 2 2 -2 -2 -1 1 1 1 1 -1 - 0 -1 2 1 -1 -1 2 1 -1 -1 -2 2 2 1 1 -1 - 2 -2 1 -1 -1 1 2 -2 -2 2 1 1 -1 -1 1 1 - 0 -1 2 -1 -1 1 2 -1 -1 1 2 2 -2 -1 1 1 - 2 -1 2 1 1 1 2 1 1 1 -2 -2 -2 -1 -1 -1 - 2 -2 1 -1 1 -1 2 -2 2 -2 1 -1 1 1 -1 1 - 0 -1 2 -1 1 -1 2 -1 1 -1 2 -2 2 1 -1 1 - 0 1 -1 -1 -1 2 1 1 1 -2 -1 -1 2 -1 2 2 - 0 0 0 0 0 0 1 0 0 -1 0 0 1 0 0 0 - 0 -1 1 1 1 0 1 1 1 0 -1 -1 0 -1 0 0 - 2 1 -2 -1 -1 1 2 1 1 -1 -2 -2 2 -1 1 1 - 0 2 -1 -1 -1 1 2 2 2 -2 -1 -1 1 -1 1 1 - 0 0 1 1 1 -1 0 0 0 0 -1 -1 1 -1 1 1 - 0 -1 2 1 1 -1 2 1 1 -1 -2 -2 2 -1 1 1 - 0 0 0 0 0 0 1 1 1 -1 -1 -1 1 -1 1 1 - 0 1 2 -1 -1 -1 -2 1 1 1 2 2 2 -1 -1 -1 - 2 -2 2 -2 2 -2 1 -1 1 -1 1 -1 1 1 -1 1 - 2 -1 1 -1 1 -2 1 -1 1 -2 1 -1 2 1 -2 2 - 0 0 1 0 0 -1 0 0 0 0 0 0 1 0 0 0 - 2 -1 2 -1 -1 -1 2 -1 -1 -1 2 2 2 -1 -1 -1 - 6 -1 1 -1 -1 -2 1 -1 -1 -2 1 1 2 -1 -2 -2 - 2 0 1 -1 -1 -1 0 0 0 0 1 1 1 -1 -1 -1 - 2 -1 1 -1 0 -1 1 -1 0 -1 1 0 1 0 -1 0 - 2 -1 1 0 -1 -1 1 0 -1 -1 0 1 1 0 0 -1 - 2 0 0 0 0 0 1 -1 -1 -1 1 1 1 -1 -1 -1 - 2 1 -1 1 1 2 1 -1 -1 -2 1 1 2 -1 -2 -2 - 0 -2 1 1 1 -1 2 2 2 -2 -1 -1 1 -1 1 1 - 0 -1 1 0 1 -1 1 0 1 -1 0 -1 1 0 0 1 - 0 -1 1 1 0 -1 1 1 0 -1 -1 0 1 0 1 0 - 2 -1 0 0 0 -1 0 0 0 -1 0 0 0 0 0 0 - 0 -1 0 1 1 -1 0 1 1 -1 0 0 0 -1 1 1 - 0 -2 2 2 2 -2 1 1 1 -1 -1 -1 1 -1 1 1 - 2 -2 -2 2 2 -2 -1 1 1 -1 1 1 -1 -1 1 1 - 2 -1 -1 1 1 -2 -1 1 1 -2 1 1 -2 -1 2 2 - 12 -1 -1 -1 -1 -2 -1 -1 -1 -2 -1 -1 -2 -1 -2 -2 - 0 0 0 0 0 0 1 0 -1 0 0 1 0 0 0 0 - 0 -1 1 1 0 1 1 1 0 1 -1 0 -1 0 -1 0 - 2 1 -2 -1 1 -1 2 1 -1 1 -2 2 -2 1 -1 1 - 0 2 -1 -1 1 -1 2 2 -2 2 -1 1 -1 1 -1 1 - 0 0 1 1 -1 1 0 0 0 0 -1 1 -1 1 -1 1 - 0 -1 2 1 -1 1 2 1 -1 1 -2 2 -2 1 -1 1 - 0 0 0 0 0 0 1 1 -1 1 -1 1 -1 1 -1 1 - 0 0 0 0 0 0 1 1 0 0 -1 0 0 0 0 0 - 0 1 -1 0 1 1 1 0 -1 -1 0 1 1 0 0 -1 - 2 1 -1 -2 1 -1 1 2 -1 1 -2 1 -1 2 -2 1 - 2 -2 -1 1 -1 1 -2 2 -2 2 1 -1 1 1 -1 1 - 0 -1 -1 2 -1 1 -1 2 -1 1 2 -1 1 2 -2 1 - 2 -1 1 2 1 1 1 2 1 1 -2 -1 -1 -2 -2 -1 - 2 1 -1 1 2 1 1 -1 -2 -1 1 2 1 -2 -1 -2 - 0 0 0 0 0 0 0 0 0 0 -1 1 0 1 0 0 - 0 1 -1 -1 1 0 1 1 -1 0 -1 1 0 1 0 0 - 0 0 0 0 0 0 0 1 -1 0 0 0 0 1 0 0 - 0 1 0 -1 1 1 0 1 -1 -1 0 0 0 1 1 -1 - 0 2 -1 -1 1 1 2 2 -2 -2 -1 1 1 1 1 -1 - 2 1 1 -1 2 1 -1 1 -2 -1 1 -2 -1 2 1 -2 - 0 1 -1 -1 2 1 1 1 -2 -1 -1 2 1 2 1 -2 - 0 -1 1 2 -1 -1 1 2 -1 -1 -2 1 1 2 2 -1 - 0 -1 1 1 -1 0 1 1 -1 0 -1 1 0 1 0 0 - 0 -1 1 2 -1 1 1 2 -1 1 -2 1 -1 2 -2 1 - 0 0 0 0 0 0 1 1 -1 -1 -1 1 1 1 1 -1 - 2 -2 -1 1 1 -1 -2 2 2 -2 1 1 -1 -1 1 1 - 0 -1 -1 2 1 -1 -1 2 1 -1 2 1 -1 -2 2 1 - 0 0 1 0 -1 0 0 0 0 0 0 1 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 -1 - 0 -2 1 1 -1 1 2 2 -2 2 -1 1 -1 1 -1 1 - 0 -1 1 0 -1 1 1 0 -1 1 0 1 -1 0 0 1 - 0 0 0 0 0 0 0 0 0 0 -1 0 1 0 1 0 - 0 1 -2 -1 1 1 2 1 -1 -1 -2 2 2 1 1 -1 - 0 1 -1 -1 0 1 1 1 0 -1 -1 0 1 0 1 0 - 2 -2 2 -2 -2 2 1 -1 -1 1 1 1 -1 -1 1 1 - 2 -1 1 -1 -2 1 1 -1 -2 1 1 2 -1 -2 1 2 - 2 1 -1 -2 -1 1 1 2 1 -1 -2 -1 1 -2 2 1 - 6 -1 1 -1 -2 -1 1 -1 -2 -1 1 2 1 -2 -1 -2 - 2 -1 1 -1 -1 0 1 -1 -1 0 1 1 0 -1 0 0 - 0 1 -1 -2 1 1 1 2 -1 -1 -2 1 1 2 2 -1 - 0 -1 1 2 1 -1 1 2 1 -1 -2 -1 1 -2 2 1 - 6 -1 -1 1 -2 -1 -1 1 -2 -1 1 -2 -1 2 1 -2 - 2 -1 -1 1 -1 0 -1 1 -1 0 1 -1 0 1 0 0 - 2 -1 0 0 -1 0 0 0 -1 0 0 0 0 0 0 0 - 0 -1 0 1 -1 1 0 1 -1 1 0 0 0 1 -1 1 - 0 -2 2 2 -2 2 1 1 -1 1 -1 1 -1 1 -1 1 - 2 -2 -2 2 -2 2 -1 1 -1 1 1 -1 1 1 -1 1 - 2 -1 -1 1 -2 1 -1 1 -2 1 1 -2 1 2 -1 2 - 12 -1 -1 -1 -2 -1 -1 -1 -2 -1 -1 -2 -1 -2 -1 -2 - 0 1 -1 -1 1 2 1 1 -1 -2 -1 1 2 1 2 -2 - 2 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 -1 - 0 0 0 0 0 0 0 1 0 -1 0 0 0 0 1 0 - 0 -1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 - 0 0 0 1 0 -1 0 0 0 0 0 0 0 0 1 0 - 2 -1 -1 2 -1 -1 -1 2 -1 -1 2 -1 -1 2 2 -1 - 6 -1 -1 1 -1 -2 -1 1 -1 -2 1 -1 -2 1 2 -2 - 2 0 -1 1 -1 -1 0 0 0 0 1 -1 -1 1 1 -1 - 2 -1 -1 1 0 -1 -1 1 0 -1 1 0 -1 0 1 0 - 2 -1 0 1 -1 -1 0 1 -1 -1 0 0 0 1 1 -1 - 2 0 0 0 0 0 -1 1 -1 -1 1 -1 -1 1 1 -1 - 2 1 1 -1 1 2 -1 1 -1 -2 1 -1 -2 1 2 -2 - 0 0 0 1 -1 0 0 0 0 0 0 0 0 1 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 -1 - 0 1 0 1 0 0 0 -1 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 1 -1 0 0 1 0 0 0 0 0 - 0 -1 1 0 1 1 1 0 1 1 0 -1 -1 0 0 -1 - 2 1 -2 1 -1 -1 2 -1 1 1 2 -2 -2 1 1 -1 - 0 2 -1 1 -1 -1 2 -2 2 2 1 -1 -1 1 1 -1 - 0 0 1 -1 1 1 0 0 0 0 1 -1 -1 1 1 -1 - 0 -1 2 -1 1 1 2 -1 1 1 2 -2 -2 1 1 -1 - 0 0 0 0 0 0 1 -1 1 1 1 -1 -1 1 1 -1 - 0 0 0 0 0 0 1 0 1 0 0 -1 0 0 0 0 - 0 1 -1 1 0 1 1 -1 0 -1 1 0 1 0 -1 0 - 2 1 -1 1 -2 -1 1 -1 2 1 1 -2 -1 2 1 -2 - 2 -2 -1 -1 1 1 -2 -2 2 2 -1 1 1 1 1 -1 - 0 -1 -1 -1 2 1 -1 -1 2 1 -1 2 1 2 1 -2 - 2 -2 2 2 -2 -2 1 1 -1 -1 -1 1 1 1 1 -1 - 2 1 -1 2 1 1 1 -2 -1 -1 2 1 1 -2 -2 -1 - 2 1 2 -1 1 1 -2 1 -1 -1 2 -2 -2 1 1 -1 - 2 -1 1 1 2 1 1 1 2 1 -1 -2 -1 -2 -1 -2 - 2 2 -2 -2 2 -2 1 1 -1 1 -1 1 -1 1 -1 1 - 2 -1 1 1 -1 -2 1 1 -1 -2 -1 1 2 1 2 -2 - 2 1 -1 -1 1 -2 1 1 -1 2 -1 1 -2 1 -2 2 - 0 0 0 0 0 0 0 -1 1 0 0 0 0 1 0 0 - 0 1 0 1 -1 1 0 -1 1 -1 0 0 0 1 -1 1 - 0 2 -1 1 -1 1 2 -2 2 -2 1 -1 1 1 -1 1 - 2 1 1 2 -1 1 -1 -2 1 -1 -2 1 -1 2 -2 1 - 0 1 -1 2 -1 1 1 -2 1 -1 2 -1 1 2 -2 1 - 0 -1 1 -1 2 -1 1 -1 2 -1 1 -2 1 2 -1 2 - 0 -1 1 -1 1 0 1 -1 1 0 1 -1 0 1 0 0 - 0 -1 1 -1 2 1 1 -1 2 1 1 -2 -1 2 1 -2 - 0 0 0 0 0 0 1 -1 1 -1 1 -1 1 1 -1 1 - 0 0 0 0 0 0 0 0 0 0 1 -1 0 1 0 0 - 0 1 -1 1 -1 0 1 -1 1 0 1 -1 0 1 0 0 - 0 0 0 0 0 0 1 0 0 1 0 0 -1 0 0 0 - 0 1 -1 1 1 0 1 -1 -1 0 1 1 0 -1 0 0 - 0 1 -1 0 0 0 1 0 0 0 0 0 0 0 0 0 - 0 2 -2 2 2 2 1 -1 -1 -1 1 1 1 -1 -1 -1 - 0 1 -2 1 1 1 2 -1 -1 -1 2 2 2 -1 -1 -1 - 2 2 -1 1 1 1 2 -2 -2 -2 1 1 1 -1 -1 -1 - 0 1 0 0 0 -1 0 0 0 1 0 0 0 0 0 0 - 0 1 1 1 1 -2 -1 -1 -1 2 -1 -1 2 -1 2 2 - 0 2 2 2 2 -2 -1 -1 -1 1 -1 -1 1 -1 1 1 - 2 2 1 1 1 -1 -2 -2 -2 2 -1 -1 1 -1 1 1 - 2 2 2 -2 -2 -2 -1 1 1 1 1 1 1 -1 -1 -1 - 2 2 -1 -1 -1 -1 2 2 2 2 -1 -1 -1 -1 -1 -1 - 6 1 -1 -1 -1 -2 1 1 1 2 -1 -1 -2 -1 -2 -2 - 2 1 0 -1 -1 -1 0 1 1 1 0 0 0 -1 -1 -1 - 2 1 1 -1 -1 -2 -1 1 1 2 1 1 2 -1 -2 -2 - 2 1 -1 -1 0 -1 1 1 0 1 -1 0 -1 0 -1 0 - 6 1 -1 -1 -2 -1 1 1 2 1 -1 -2 -1 -2 -1 -2 - 2 1 -1 0 -1 -1 1 0 1 1 0 -1 -1 0 0 -1 - 2 2 -2 2 -2 -2 1 -1 1 1 1 -1 -1 1 1 -1 - 2 1 -1 1 -1 -2 1 -1 1 2 1 -1 -2 1 2 -2 - 2 -1 -2 1 1 -1 -2 1 1 -1 2 2 -2 -1 1 1 - 2 -1 1 1 -2 -1 1 1 -2 -1 -1 2 1 2 1 -2 - 2 -1 1 1 1 2 1 1 1 2 -1 -1 -2 -1 -2 -2 - 2 2 -2 -2 -2 2 1 1 1 -1 -1 -1 1 -1 1 1 - 2 -1 1 -2 1 -1 1 -2 1 -1 2 -1 1 2 -2 1 - 2 1 -1 -1 -1 0 1 1 1 0 -1 -1 0 -1 0 0 - 2 0 0 0 0 0 1 1 1 1 -1 -1 -1 -1 -1 -1 - 0 1 -2 1 1 -1 2 -1 -1 1 2 2 -2 -1 1 1 - 0 1 -1 0 1 -1 1 0 -1 1 0 1 -1 0 0 1 - 0 1 -1 1 0 -1 1 -1 0 1 1 0 -1 0 1 0 - 2 0 -1 0 0 -1 0 0 0 0 0 0 -1 0 0 0 - 0 0 -1 1 1 -1 0 0 0 0 1 1 -1 -1 1 1 - 0 2 -2 2 2 -2 1 -1 -1 1 1 1 -1 -1 1 1 - 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 -1 - 0 1 1 1 -1 0 -1 -1 1 0 -1 1 0 1 0 0 - 0 1 0 0 -1 0 0 0 1 0 0 0 0 0 0 0 - 2 2 1 1 -1 1 -2 -2 2 -2 -1 1 -1 1 -1 1 - 0 2 2 2 -2 2 -1 -1 1 -1 -1 1 -1 1 -1 1 - 0 1 1 1 -2 1 -1 -1 2 -1 -1 2 -1 2 -1 2 - 0 1 1 1 -2 -1 -1 -1 2 1 -1 2 1 2 1 -2 - 0 1 0 1 -1 -1 0 -1 1 1 0 0 0 1 1 -1 - 0 1 1 0 -1 -1 -1 0 1 1 0 1 1 0 0 -1 - 2 0 0 0 -1 -1 0 0 0 0 0 0 0 0 0 -1 - 0 0 1 1 -1 -1 0 0 0 0 -1 1 1 1 1 -1 - 0 2 2 2 -2 -2 -1 -1 1 1 -1 1 1 1 1 -1 - 2 1 1 -1 -2 -1 -1 1 2 1 1 2 1 -2 -1 -2 - 0 0 0 0 0 0 0 -1 0 1 0 0 0 0 1 0 - 2 1 1 2 1 -1 -1 -2 -1 1 -2 -1 1 -2 2 1 - 0 1 0 1 1 -1 0 -1 -1 1 0 0 0 -1 1 1 - 0 2 -1 1 1 -1 2 -2 -2 2 1 1 -1 -1 1 1 - 0 1 -1 2 1 -1 1 -2 -1 1 2 1 -1 -2 2 1 - 0 -1 1 -1 -1 2 1 -1 -1 2 1 1 -2 -1 2 2 - 0 -2 1 -1 1 1 2 -2 2 2 1 -1 -1 1 1 -1 - 0 -1 1 -1 0 1 1 -1 0 1 1 0 -1 0 1 0 - 0 -1 1 -2 1 1 1 -2 1 1 2 -1 -1 2 2 -1 - 0 -1 1 -1 1 2 1 -1 1 2 1 -1 -2 1 2 -2 - 0 0 0 0 0 0 1 -1 -1 1 1 1 -1 -1 1 1 - 0 1 -2 1 -1 1 2 -1 1 -1 2 -2 2 1 -1 1 - 0 1 -1 0 -1 1 1 0 1 -1 0 -1 1 0 0 1 - 0 0 0 0 0 0 -1 -1 1 1 -1 1 1 1 1 -1 - 0 1 1 2 -1 -1 -1 -2 1 1 -2 1 1 2 2 -1 - 2 -1 -2 1 -1 1 -2 1 -1 1 2 -2 2 1 -1 1 - 0 -1 -1 -1 1 2 -1 -1 1 2 -1 1 2 1 2 -2 - 2 1 -1 -1 -2 1 1 1 2 -1 -1 -2 1 -2 1 2 - 2 -1 1 -2 -1 1 1 -2 -1 1 2 1 -1 -2 2 1 - 2 0 -1 0 -1 0 0 0 0 0 0 -1 0 0 0 0 - 0 0 -1 1 -1 1 0 0 0 0 1 -1 1 1 -1 1 - 0 2 -2 2 -2 2 1 -1 1 -1 1 -1 1 1 -1 1 - 2 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 -1 - 0 0 0 0 0 0 0 0 0 0 1 0 -1 0 1 0 - 0 0 -1 1 0 0 0 0 0 0 1 0 0 0 0 0 - 0 1 1 0 0 0 -1 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 -1 1 0 0 1 0 0 0 0 0 - 0 -1 0 1 1 1 0 1 1 1 0 0 0 -1 -1 -1 - 2 1 1 -2 -1 -1 -1 2 1 1 2 1 1 -2 -2 -1 - 0 2 1 -1 -1 -1 -2 2 2 2 1 1 1 -1 -1 -1 - 0 0 -1 1 1 1 0 0 0 0 1 1 1 -1 -1 -1 - 0 -1 -1 2 1 1 -1 2 1 1 2 1 1 -2 -2 -1 - 0 0 0 0 0 0 -1 1 1 1 1 1 1 -1 -1 -1 - 0 0 0 0 0 0 0 1 1 0 0 0 0 -1 0 0 - 0 1 1 -1 0 1 -1 1 0 -1 1 0 -1 0 1 0 - 0 0 0 0 0 0 0 0 0 0 1 1 0 -1 0 0 - 0 1 1 -1 -1 0 -1 1 1 0 1 1 0 -1 0 0 - 0 0 0 0 0 0 0 1 0 1 0 0 0 0 -1 0 - 0 1 1 -1 1 0 -1 1 -1 0 1 -1 0 1 0 0 - 0 1 0 -1 0 0 0 1 0 0 0 0 0 0 0 0 - 2 2 1 -1 1 1 -2 2 -2 -2 1 -1 -1 1 1 -1 - 0 2 2 -2 2 2 -1 1 -1 -1 1 -1 -1 1 1 -1 - 0 1 1 -2 1 1 -1 2 -1 -1 2 -1 -1 2 2 -1 - 0 1 1 -2 1 -1 -1 2 -1 1 2 -1 1 2 -2 1 - 0 1 0 -1 1 -1 0 1 -1 1 0 0 0 1 -1 1 - 0 1 1 -1 0 -1 -1 1 0 1 1 0 1 0 -1 0 - 2 0 0 -1 0 -1 0 0 0 0 0 0 0 0 -1 0 - 0 0 1 -1 1 -1 0 0 0 0 1 -1 1 1 -1 1 - 0 2 2 -2 2 -2 -1 1 -1 1 1 -1 1 1 -1 1 - 2 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 -1 - 0 0 1 -1 0 0 0 0 0 0 1 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 1 0 1 0 -1 0 - 2 1 1 1 1 0 -1 -1 -1 0 -1 -1 0 -1 0 0 - 2 0 0 0 0 0 0 -1 -1 0 0 0 0 -1 0 0 - 0 0 0 0 0 0 0 0 -1 1 0 0 0 0 0 1 - 0 -1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 - 0 0 0 0 -1 1 0 0 0 0 0 0 0 0 0 1 - 2 -1 -1 -1 -1 2 -1 -1 -1 2 -1 -1 2 -1 2 2 - 6 -1 -1 -1 -2 1 -1 -1 -2 1 -1 -2 1 -2 1 2 - 2 0 -1 -1 -1 1 0 0 0 0 -1 -1 1 -1 1 1 - 2 -1 -1 0 -1 1 -1 0 -1 1 0 -1 1 0 0 1 - 2 -1 0 -1 -1 1 0 -1 -1 1 0 0 0 -1 1 1 - 2 0 0 0 0 0 -1 -1 -1 1 -1 -1 1 -1 1 1 - 2 1 1 1 2 -1 -1 -1 -2 1 -1 -2 1 -2 1 2 - 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 1 1 - 0 0 0 -1 0 1 0 0 0 0 0 0 0 0 1 0 - 2 0 0 0 0 0 0 0 0 0 -1 -1 0 -1 0 0 - 0 0 0 0 0 0 0 0 0 0 0 -1 1 0 0 1 - 0 0 -1 0 0 1 0 0 0 0 0 0 1 0 0 0 - 0 0 0 0 0 0 -1 0 0 1 0 0 1 0 0 0 - 2 1 2 1 1 -1 -2 -1 -1 1 -2 -2 2 -1 1 1 - 0 1 1 0 1 -1 -1 0 -1 1 0 -1 1 0 0 1 - 0 2 1 -1 1 -1 -2 2 -2 2 1 -1 1 1 -1 1 - 0 1 2 -1 1 -1 -2 1 -1 1 2 -2 2 1 -1 1 - 0 1 1 1 0 -1 -1 -1 0 1 -1 0 1 0 1 0 - 0 2 1 1 -1 -1 -2 -2 2 2 -1 1 1 1 1 -1 - 0 1 1 1 -1 -2 -1 -1 1 2 -1 1 2 1 2 -2 - 0 1 2 1 -1 -1 -2 -1 1 1 -2 2 2 1 1 -1 - 0 1 1 -1 1 -2 -1 1 -1 2 1 -1 2 1 -2 2 - 0 -2 -1 1 1 1 -2 2 2 2 1 1 1 -1 -1 -1 - 0 -1 -1 1 0 1 -1 1 0 1 1 0 1 0 -1 0 - 0 -1 -2 1 1 1 -2 1 1 1 2 2 2 -1 -1 -1 - 0 -1 -1 1 1 2 -1 1 1 2 1 1 2 -1 -2 -2 - 0 -1 -1 1 -1 2 -1 1 -1 2 1 -1 2 1 -2 2 - 0 1 1 -2 -1 1 -1 2 1 -1 2 1 -1 -2 2 1 - 0 1 0 -1 -1 1 0 1 1 -1 0 0 0 -1 1 1 - 2 0 0 -1 -1 0 0 0 0 0 0 0 0 -1 0 0 - 0 0 1 -1 -1 1 0 0 0 0 1 1 -1 -1 1 1 - 0 2 2 -2 -2 2 -1 1 1 -1 1 1 -1 -1 1 1 - 0 0 0 0 0 0 -1 1 -1 1 1 -1 1 1 -1 1 - 0 1 1 -1 2 -1 -1 1 -2 1 1 -2 1 2 -1 2 - 6 1 -1 -2 -1 -1 1 2 1 1 -2 -1 -1 -2 -2 -1 - 2 0 0 0 0 0 -1 0 -1 0 0 -1 0 0 0 0 - 6 1 1 1 2 1 -1 -1 -2 -1 -1 -2 -1 -2 -1 -2 - 2 1 1 1 0 1 -1 -1 0 -1 -1 0 -1 0 -1 0 - 2 0 0 0 0 0 0 -1 0 -1 0 0 0 0 -1 0 - 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 1 - 0 -1 0 0 1 0 0 0 1 0 0 0 0 0 0 0 - 0 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 1 - 2 -1 -1 -1 2 -1 -1 -1 2 -1 -1 2 -1 2 -1 2 - 6 -1 -1 -1 1 -2 -1 -1 1 -2 -1 1 -2 1 -2 2 - 2 0 -1 -1 1 -1 0 0 0 0 -1 1 -1 1 -1 1 - 2 -1 -1 0 1 -1 -1 0 1 -1 0 1 -1 0 0 1 - 2 -1 0 -1 1 -1 0 -1 1 -1 0 0 0 1 -1 1 - 2 0 0 0 0 0 -1 -1 1 -1 -1 1 -1 1 -1 1 - 2 1 1 1 -1 2 -1 -1 1 -2 -1 1 -2 1 -2 2 - 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 1 - 0 0 0 -1 1 0 0 0 0 0 0 0 0 1 0 0 - 2 0 0 0 0 0 0 0 0 0 -1 0 -1 0 -1 0 - 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 1 - 0 0 -1 0 1 0 0 0 0 0 0 1 0 0 0 0 - 0 0 0 0 0 0 -1 0 1 0 0 1 0 0 0 0 - 0 1 1 0 -1 1 -1 0 1 -1 0 1 -1 0 0 1 - 0 2 1 -1 -1 1 -2 2 2 -2 1 1 -1 -1 1 1 - 2 1 2 1 -1 1 -2 -1 1 -1 -2 2 -2 1 -1 1 - 0 1 2 -1 -1 1 -2 1 1 -1 2 2 -2 -1 1 1 - 0 -1 -1 1 1 0 -1 1 1 0 1 1 0 -1 0 0 - 0 -1 -1 1 2 1 -1 1 2 1 1 2 1 -2 -1 -2 - 0 -1 -1 1 2 -1 -1 1 2 -1 1 2 -1 -2 1 2 - 0 0 0 0 0 0 -1 1 1 -1 1 1 -1 -1 1 1 - 2 0 0 0 0 0 -1 -1 0 0 -1 0 0 0 0 0 - 6 1 1 2 1 1 -1 -2 -1 -1 -2 -1 -1 -2 -2 -1 - 0 1 -1 1 1 -2 1 -1 -1 2 1 1 -2 -1 2 2 - 0 -1 1 1 -2 1 1 1 -2 1 -1 2 -1 2 -1 2 - 6 -1 -1 -2 -1 1 -1 -2 -1 1 -2 -1 1 -2 2 1 - 2 -1 -1 -1 0 1 -1 -1 0 1 -1 0 1 0 1 0 - 0 -1 1 1 -1 2 1 1 -1 2 -1 1 -2 1 -2 2 - 0 1 -1 1 2 -1 1 -1 -2 1 1 2 -1 -2 1 2 - 0 1 -1 1 -2 1 1 -1 2 -1 1 -2 1 2 -1 2 - 0 -1 1 1 1 -2 1 1 1 -2 -1 -1 2 -1 2 2 - 0 -1 1 1 2 -1 1 1 2 -1 -1 -2 1 -2 1 2 - 6 -1 -1 -2 1 -1 -1 -2 1 -1 -2 1 -1 2 -2 1 - 2 -1 -1 -1 1 0 -1 -1 1 0 -1 1 0 1 0 0 - 2 -2 -2 -2 2 2 -1 -1 1 1 -1 1 1 1 1 -1 - 0 -2 2 -2 2 2 1 -1 1 1 1 -1 -1 1 1 -1 - 0 -1 0 -1 1 1 0 -1 1 1 0 0 0 1 1 -1 - 2 -1 -1 -2 1 1 -1 -2 1 1 -2 1 1 2 2 -1 - 2 -1 0 -1 0 0 0 -1 0 0 0 0 0 0 0 0 - 12 -2 -2 -2 -2 -2 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 - 12 -1 -1 -2 -1 -1 -1 -2 -1 -1 -2 -1 -1 -2 -2 -1 - 6 -1 1 -2 -1 -1 1 -2 -1 -1 2 1 1 -2 -2 -1 - 6 -1 0 -1 -1 -1 0 -1 -1 -1 0 0 0 -1 -1 -1 - 6 -2 1 -1 -1 -1 2 -2 -2 -2 1 1 1 -1 -1 -1 - 0 1 -1 1 -1 2 1 -1 1 -2 1 -1 2 1 -2 2 - 0 2 -2 -2 2 2 1 1 -1 -1 -1 1 1 1 1 -1 - 0 0 -1 -1 1 1 0 0 0 0 -1 1 1 1 1 -1 - 2 0 -1 -1 0 0 0 0 0 0 -1 0 0 0 0 0 - 0 1 1 -1 -2 1 -1 1 2 -1 1 2 -1 -2 1 2 - 0 -2 -2 2 2 2 -1 1 1 1 1 1 1 -1 -1 -1 - 0 -1 -1 0 1 1 -1 0 1 1 0 1 1 0 0 -1 - 2 -1 -2 -1 1 1 -2 -1 1 1 -2 2 2 1 1 -1 - 0 1 1 -1 -1 2 -1 1 1 -2 1 1 -2 -1 2 2 - 6 1 2 1 1 1 -2 -1 -1 -1 -2 -2 -2 -1 -1 -1 - 6 2 -2 -2 -2 -2 1 1 1 1 -1 -1 -1 -1 -1 -1 - 6 2 1 1 1 1 -2 -2 -2 -2 -1 -1 -1 -1 -1 -1 - 6 -2 2 -2 -2 -2 1 -1 -1 -1 1 1 1 -1 -1 -1 - 6 -2 -2 2 -2 -2 -1 1 -1 -1 1 -1 -1 1 1 -1 - 2 -1 -1 0 0 0 -1 0 0 0 0 0 0 0 0 0 - 12 -1 -2 -1 -1 -1 -2 -1 -1 -1 -2 -2 -2 -1 -1 -1 - 6 -1 -2 1 -1 -1 -2 1 -1 -1 2 -2 -2 1 1 -1 - 6 -1 -1 0 -1 -1 -1 0 -1 -1 0 -1 -1 0 0 -1 - 6 -2 -1 1 -1 -1 -2 2 -2 -2 1 -1 -1 1 1 -1 - 6 -1 -2 -1 1 -1 -2 -1 1 -1 -2 2 -2 1 -1 1 - 6 -2 -2 -2 2 -2 -1 -1 1 -1 -1 1 -1 1 -1 1 - 6 -1 -1 -1 0 -1 -1 -1 0 -1 -1 0 -1 0 -1 0 - 6 -2 -1 -1 1 -1 -2 -2 2 -2 -1 1 -1 1 -1 1 - 12 -2 -1 -1 -1 -1 -2 -2 -2 -2 -1 -1 -1 -1 -1 -1 - 6 -1 -2 -1 -1 1 -2 -1 -1 1 -2 -2 2 -1 1 1 - 6 -2 -2 -2 -2 2 -1 -1 -1 1 -1 -1 1 -1 1 1 - 6 -1 -1 -1 -1 0 -1 -1 -1 0 -1 -1 0 -1 0 0 - 6 -2 -1 -1 -1 1 -2 -2 -2 2 -1 -1 1 -1 1 1 - 6 0 -1 -1 -1 -1 0 0 0 0 -1 -1 -1 -1 -1 -1 - 6 1 -2 -1 -1 -1 2 1 1 1 -2 -2 -2 -1 -1 -1 - 6 0 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 - 2 0 0 0 0 0 -1 0 0 -1 0 0 -1 0 0 0 - 6 1 1 1 1 2 -1 -1 -1 -2 -1 -1 -2 -1 -2 -2 -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/ine/test-062/ep.ine new/lrslib-071b/ine/test-062/ep.ine --- old/lrslib-071a/ine/test-062/ep.ine 1970-01-01 01:00:00.000000000 +0100 +++ new/lrslib-071b/ine/test-062/ep.ine 2021-06-04 09:17:58.000000000 +0200 @@ -0,0 +1,23 @@ +ep +H-representation +begin +17 4 rational +0 1 -1 0 +0 0 1 -1 +0 1 1 2 +1 -2 0 2 +691 -1562 -1562 -1562 +0 1 0 -1 +2/11 0 0 -1 +17/142 1/2 1/2 -1 +37/142 0 0 0 +691/1562 -1 0 0 +27/71 -1/2 1/2 0 +2/11 1 1 1 +4/11 0 1 1 +471/1562 1/2 3/2 1 +2/11 1 -1 -1 +4/11 0 -1 -1 +471/1562 1/2 -1/2 -1 +end +redund 0 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/ine/test-062/zcp6.ine new/lrslib-071b/ine/test-062/zcp6.ine --- old/lrslib-071a/ine/test-062/zcp6.ine 1970-01-01 01:00:00.000000000 +0100 +++ new/lrslib-071b/ine/test-062/zcp6.ine 2021-06-04 08:37:21.000000000 +0200 @@ -0,0 +1,374 @@ +cp6.ine +*6 point cut polytope +H-representation +begin +368 16 integer + 2 0 1 1 1 1 0 0 0 0 -1 -1 -1 -1 -1 -1 + 2 1 0 1 1 1 0 -1 -1 -1 0 0 0 -1 -1 -1 + 2 1 1 0 1 1 -1 0 -1 -1 0 -1 -1 0 0 -1 + 0 1 0 0 1 0 0 0 -1 0 0 0 0 0 0 0 + 0 1 0 0 0 1 0 0 0 -1 0 0 0 0 0 0 + 0 0 1 0 1 0 0 0 0 0 0 -1 0 0 0 0 + 0 0 1 0 0 1 0 0 0 0 0 0 -1 0 0 0 + 0 0 0 1 1 0 0 0 0 0 0 0 0 -1 0 0 + 0 0 0 1 0 1 0 0 0 0 0 0 0 0 -1 0 + 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 -1 + 2 2 2 2 2 2 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 + 0 0 1 1 0 0 0 0 0 0 -1 0 0 0 0 0 + 0 -1 1 0 0 0 1 0 0 0 0 0 0 0 0 0 + 0 -2 2 2 2 2 1 1 1 1 -1 -1 -1 -1 -1 -1 + 0 -2 1 1 1 1 2 2 2 2 -1 -1 -1 -1 -1 -1 + 0 1 -1 2 -1 -1 1 -2 1 1 2 -1 -1 2 2 -1 + 0 1 -1 -1 2 -1 1 1 -2 1 -1 2 -1 2 -1 2 + 2 -2 1 1 -1 -1 2 2 -2 -2 -1 1 1 1 1 -1 + 0 -1 2 1 -1 -1 2 1 -1 -1 -2 2 2 1 1 -1 + 2 -2 1 -1 -1 1 2 -2 -2 2 1 1 -1 -1 1 1 + 0 -1 2 -1 -1 1 2 -1 -1 1 2 2 -2 -1 1 1 + 2 -1 2 1 1 1 2 1 1 1 -2 -2 -2 -1 -1 -1 + 2 -2 1 -1 1 -1 2 -2 2 -2 1 -1 1 1 -1 1 + 0 -1 2 -1 1 -1 2 -1 1 -1 2 -2 2 1 -1 1 + 0 1 -1 -1 -1 2 1 1 1 -2 -1 -1 2 -1 2 2 + 0 0 0 0 0 0 1 0 0 -1 0 0 1 0 0 0 + 0 -1 1 1 1 0 1 1 1 0 -1 -1 0 -1 0 0 + 2 1 -2 -1 -1 1 2 1 1 -1 -2 -2 2 -1 1 1 + 0 2 -1 -1 -1 1 2 2 2 -2 -1 -1 1 -1 1 1 + 0 0 1 1 1 -1 0 0 0 0 -1 -1 1 -1 1 1 + 0 -1 2 1 1 -1 2 1 1 -1 -2 -2 2 -1 1 1 + 0 0 0 0 0 0 1 1 1 -1 -1 -1 1 -1 1 1 + 0 1 2 -1 -1 -1 -2 1 1 1 2 2 2 -1 -1 -1 + 2 -2 2 -2 2 -2 1 -1 1 -1 1 -1 1 1 -1 1 + 2 -1 1 -1 1 -2 1 -1 1 -2 1 -1 2 1 -2 2 + 0 0 1 0 0 -1 0 0 0 0 0 0 1 0 0 0 + 2 -1 2 -1 -1 -1 2 -1 -1 -1 2 2 2 -1 -1 -1 + 6 -1 1 -1 -1 -2 1 -1 -1 -2 1 1 2 -1 -2 -2 + 2 0 1 -1 -1 -1 0 0 0 0 1 1 1 -1 -1 -1 + 2 -1 1 -1 0 -1 1 -1 0 -1 1 0 1 0 -1 0 + 2 -1 1 0 -1 -1 1 0 -1 -1 0 1 1 0 0 -1 + 2 0 0 0 0 0 1 -1 -1 -1 1 1 1 -1 -1 -1 + 2 1 -1 1 1 2 1 -1 -1 -2 1 1 2 -1 -2 -2 + 0 -2 1 1 1 -1 2 2 2 -2 -1 -1 1 -1 1 1 + 0 -1 1 0 1 -1 1 0 1 -1 0 -1 1 0 0 1 + 0 -1 1 1 0 -1 1 1 0 -1 -1 0 1 0 1 0 + 2 -1 0 0 0 -1 0 0 0 -1 0 0 0 0 0 0 + 0 -1 0 1 1 -1 0 1 1 -1 0 0 0 -1 1 1 + 0 -2 2 2 2 -2 1 1 1 -1 -1 -1 1 -1 1 1 + 2 -2 -2 2 2 -2 -1 1 1 -1 1 1 -1 -1 1 1 + 2 -1 -1 1 1 -2 -1 1 1 -2 1 1 -2 -1 2 2 + 12 -1 -1 -1 -1 -2 -1 -1 -1 -2 -1 -1 -2 -1 -2 -2 + 0 0 0 0 0 0 1 0 -1 0 0 1 0 0 0 0 + 0 -1 1 1 0 1 1 1 0 1 -1 0 -1 0 -1 0 + 2 1 -2 -1 1 -1 2 1 -1 1 -2 2 -2 1 -1 1 + 0 2 -1 -1 1 -1 2 2 -2 2 -1 1 -1 1 -1 1 + 0 0 1 1 -1 1 0 0 0 0 -1 1 -1 1 -1 1 + 0 -1 2 1 -1 1 2 1 -1 1 -2 2 -2 1 -1 1 + 0 0 0 0 0 0 1 1 -1 1 -1 1 -1 1 -1 1 + 0 0 0 0 0 0 1 1 0 0 -1 0 0 0 0 0 + 0 1 -1 0 1 1 1 0 -1 -1 0 1 1 0 0 -1 + 2 1 -1 -2 1 -1 1 2 -1 1 -2 1 -1 2 -2 1 + 2 -2 -1 1 -1 1 -2 2 -2 2 1 -1 1 1 -1 1 + 0 -1 -1 2 -1 1 -1 2 -1 1 2 -1 1 2 -2 1 + 2 -1 1 2 1 1 1 2 1 1 -2 -1 -1 -2 -2 -1 + 2 1 -1 1 2 1 1 -1 -2 -1 1 2 1 -2 -1 -2 + 0 0 0 0 0 0 0 0 0 0 -1 1 0 1 0 0 + 0 1 -1 -1 1 0 1 1 -1 0 -1 1 0 1 0 0 + 0 0 0 0 0 0 0 1 -1 0 0 0 0 1 0 0 + 0 1 0 -1 1 1 0 1 -1 -1 0 0 0 1 1 -1 + 0 2 -1 -1 1 1 2 2 -2 -2 -1 1 1 1 1 -1 + 2 1 1 -1 2 1 -1 1 -2 -1 1 -2 -1 2 1 -2 + 0 1 -1 -1 2 1 1 1 -2 -1 -1 2 1 2 1 -2 + 0 -1 1 2 -1 -1 1 2 -1 -1 -2 1 1 2 2 -1 + 0 -1 1 1 -1 0 1 1 -1 0 -1 1 0 1 0 0 + 0 -1 1 2 -1 1 1 2 -1 1 -2 1 -1 2 -2 1 + 0 0 0 0 0 0 1 1 -1 -1 -1 1 1 1 1 -1 + 2 -2 -1 1 1 -1 -2 2 2 -2 1 1 -1 -1 1 1 + 0 -1 -1 2 1 -1 -1 2 1 -1 2 1 -1 -2 2 1 + 0 0 1 0 -1 0 0 0 0 0 0 1 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 -1 + 0 -2 1 1 -1 1 2 2 -2 2 -1 1 -1 1 -1 1 + 0 -1 1 0 -1 1 1 0 -1 1 0 1 -1 0 0 1 + 0 0 0 0 0 0 0 0 0 0 -1 0 1 0 1 0 + 0 1 -2 -1 1 1 2 1 -1 -1 -2 2 2 1 1 -1 + 0 1 -1 -1 0 1 1 1 0 -1 -1 0 1 0 1 0 + 2 -2 2 -2 -2 2 1 -1 -1 1 1 1 -1 -1 1 1 + 2 -1 1 -1 -2 1 1 -1 -2 1 1 2 -1 -2 1 2 + 2 1 -1 -2 -1 1 1 2 1 -1 -2 -1 1 -2 2 1 + 6 -1 1 -1 -2 -1 1 -1 -2 -1 1 2 1 -2 -1 -2 + 2 -1 1 -1 -1 0 1 -1 -1 0 1 1 0 -1 0 0 + 0 1 -1 -2 1 1 1 2 -1 -1 -2 1 1 2 2 -1 + 0 -1 1 2 1 -1 1 2 1 -1 -2 -1 1 -2 2 1 + 6 -1 -1 1 -2 -1 -1 1 -2 -1 1 -2 -1 2 1 -2 + 2 -1 -1 1 -1 0 -1 1 -1 0 1 -1 0 1 0 0 + 2 -1 0 0 -1 0 0 0 -1 0 0 0 0 0 0 0 + 0 -1 0 1 -1 1 0 1 -1 1 0 0 0 1 -1 1 + 0 -2 2 2 -2 2 1 1 -1 1 -1 1 -1 1 -1 1 + 2 -2 -2 2 -2 2 -1 1 -1 1 1 -1 1 1 -1 1 + 2 -1 -1 1 -2 1 -1 1 -2 1 1 -2 1 2 -1 2 + 12 -1 -1 -1 -2 -1 -1 -1 -2 -1 -1 -2 -1 -2 -1 -2 + 0 1 -1 -1 1 2 1 1 -1 -2 -1 1 2 1 2 -2 + 2 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 -1 + 0 0 0 0 0 0 0 1 0 -1 0 0 0 0 1 0 + 0 -1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 + 0 0 0 1 0 -1 0 0 0 0 0 0 0 0 1 0 + 2 -1 -1 2 -1 -1 -1 2 -1 -1 2 -1 -1 2 2 -1 + 6 -1 -1 1 -1 -2 -1 1 -1 -2 1 -1 -2 1 2 -2 + 2 0 -1 1 -1 -1 0 0 0 0 1 -1 -1 1 1 -1 + 2 -1 -1 1 0 -1 -1 1 0 -1 1 0 -1 0 1 0 + 2 -1 0 1 -1 -1 0 1 -1 -1 0 0 0 1 1 -1 + 2 0 0 0 0 0 -1 1 -1 -1 1 -1 -1 1 1 -1 + 2 1 1 -1 1 2 -1 1 -1 -2 1 -1 -2 1 2 -2 + 0 0 0 1 -1 0 0 0 0 0 0 0 0 1 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 -1 + 0 1 0 1 0 0 0 -1 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 1 -1 0 0 1 0 0 0 0 0 + 0 -1 1 0 1 1 1 0 1 1 0 -1 -1 0 0 -1 + 2 1 -2 1 -1 -1 2 -1 1 1 2 -2 -2 1 1 -1 + 0 2 -1 1 -1 -1 2 -2 2 2 1 -1 -1 1 1 -1 + 0 0 1 -1 1 1 0 0 0 0 1 -1 -1 1 1 -1 + 0 -1 2 -1 1 1 2 -1 1 1 2 -2 -2 1 1 -1 + 0 0 0 0 0 0 1 -1 1 1 1 -1 -1 1 1 -1 + 0 0 0 0 0 0 1 0 1 0 0 -1 0 0 0 0 + 0 1 -1 1 0 1 1 -1 0 -1 1 0 1 0 -1 0 + 2 1 -1 1 -2 -1 1 -1 2 1 1 -2 -1 2 1 -2 + 2 -2 -1 -1 1 1 -2 -2 2 2 -1 1 1 1 1 -1 + 0 -1 -1 -1 2 1 -1 -1 2 1 -1 2 1 2 1 -2 + 2 -2 2 2 -2 -2 1 1 -1 -1 -1 1 1 1 1 -1 + 2 1 -1 2 1 1 1 -2 -1 -1 2 1 1 -2 -2 -1 + 2 1 2 -1 1 1 -2 1 -1 -1 2 -2 -2 1 1 -1 + 2 -1 1 1 2 1 1 1 2 1 -1 -2 -1 -2 -1 -2 + 2 2 -2 -2 2 -2 1 1 -1 1 -1 1 -1 1 -1 1 + 2 -1 1 1 -1 -2 1 1 -1 -2 -1 1 2 1 2 -2 + 2 1 -1 -1 1 -2 1 1 -1 2 -1 1 -2 1 -2 2 + 0 0 0 0 0 0 0 -1 1 0 0 0 0 1 0 0 + 0 1 0 1 -1 1 0 -1 1 -1 0 0 0 1 -1 1 + 0 2 -1 1 -1 1 2 -2 2 -2 1 -1 1 1 -1 1 + 2 1 1 2 -1 1 -1 -2 1 -1 -2 1 -1 2 -2 1 + 0 1 -1 2 -1 1 1 -2 1 -1 2 -1 1 2 -2 1 + 0 -1 1 -1 2 -1 1 -1 2 -1 1 -2 1 2 -1 2 + 0 -1 1 -1 1 0 1 -1 1 0 1 -1 0 1 0 0 + 0 -1 1 -1 2 1 1 -1 2 1 1 -2 -1 2 1 -2 + 0 0 0 0 0 0 1 -1 1 -1 1 -1 1 1 -1 1 + 0 0 0 0 0 0 0 0 0 0 1 -1 0 1 0 0 + 0 1 -1 1 -1 0 1 -1 1 0 1 -1 0 1 0 0 + 0 0 0 0 0 0 1 0 0 1 0 0 -1 0 0 0 + 0 1 -1 1 1 0 1 -1 -1 0 1 1 0 -1 0 0 + 0 1 -1 0 0 0 1 0 0 0 0 0 0 0 0 0 + 0 2 -2 2 2 2 1 -1 -1 -1 1 1 1 -1 -1 -1 + 0 1 -2 1 1 1 2 -1 -1 -1 2 2 2 -1 -1 -1 + 2 2 -1 1 1 1 2 -2 -2 -2 1 1 1 -1 -1 -1 + 0 1 0 0 0 -1 0 0 0 1 0 0 0 0 0 0 + 0 1 1 1 1 -2 -1 -1 -1 2 -1 -1 2 -1 2 2 + 0 2 2 2 2 -2 -1 -1 -1 1 -1 -1 1 -1 1 1 + 2 2 1 1 1 -1 -2 -2 -2 2 -1 -1 1 -1 1 1 + 2 2 2 -2 -2 -2 -1 1 1 1 1 1 1 -1 -1 -1 + 2 2 -1 -1 -1 -1 2 2 2 2 -1 -1 -1 -1 -1 -1 + 6 1 -1 -1 -1 -2 1 1 1 2 -1 -1 -2 -1 -2 -2 + 2 1 0 -1 -1 -1 0 1 1 1 0 0 0 -1 -1 -1 + 2 1 1 -1 -1 -2 -1 1 1 2 1 1 2 -1 -2 -2 + 2 1 -1 -1 0 -1 1 1 0 1 -1 0 -1 0 -1 0 + 6 1 -1 -1 -2 -1 1 1 2 1 -1 -2 -1 -2 -1 -2 + 2 1 -1 0 -1 -1 1 0 1 1 0 -1 -1 0 0 -1 + 2 2 -2 2 -2 -2 1 -1 1 1 1 -1 -1 1 1 -1 + 2 1 -1 1 -1 -2 1 -1 1 2 1 -1 -2 1 2 -2 + 2 -1 -2 1 1 -1 -2 1 1 -1 2 2 -2 -1 1 1 + 2 -1 1 1 -2 -1 1 1 -2 -1 -1 2 1 2 1 -2 + 2 -1 1 1 1 2 1 1 1 2 -1 -1 -2 -1 -2 -2 + 2 2 -2 -2 -2 2 1 1 1 -1 -1 -1 1 -1 1 1 + 2 -1 1 -2 1 -1 1 -2 1 -1 2 -1 1 2 -2 1 + 2 1 -1 -1 -1 0 1 1 1 0 -1 -1 0 -1 0 0 + 2 0 0 0 0 0 1 1 1 1 -1 -1 -1 -1 -1 -1 + 0 1 -2 1 1 -1 2 -1 -1 1 2 2 -2 -1 1 1 + 0 1 -1 0 1 -1 1 0 -1 1 0 1 -1 0 0 1 + 0 1 -1 1 0 -1 1 -1 0 1 1 0 -1 0 1 0 + 2 0 -1 0 0 -1 0 0 0 0 0 0 -1 0 0 0 + 0 0 -1 1 1 -1 0 0 0 0 1 1 -1 -1 1 1 + 0 2 -2 2 2 -2 1 -1 -1 1 1 1 -1 -1 1 1 + 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 -1 + 0 1 1 1 -1 0 -1 -1 1 0 -1 1 0 1 0 0 + 0 1 0 0 -1 0 0 0 1 0 0 0 0 0 0 0 + 2 2 1 1 -1 1 -2 -2 2 -2 -1 1 -1 1 -1 1 + 0 2 2 2 -2 2 -1 -1 1 -1 -1 1 -1 1 -1 1 + 0 1 1 1 -2 1 -1 -1 2 -1 -1 2 -1 2 -1 2 + 0 1 1 1 -2 -1 -1 -1 2 1 -1 2 1 2 1 -2 + 0 1 0 1 -1 -1 0 -1 1 1 0 0 0 1 1 -1 + 0 1 1 0 -1 -1 -1 0 1 1 0 1 1 0 0 -1 + 2 0 0 0 -1 -1 0 0 0 0 0 0 0 0 0 -1 + 0 0 1 1 -1 -1 0 0 0 0 -1 1 1 1 1 -1 + 0 2 2 2 -2 -2 -1 -1 1 1 -1 1 1 1 1 -1 + 2 1 1 -1 -2 -1 -1 1 2 1 1 2 1 -2 -1 -2 + 0 0 0 0 0 0 0 -1 0 1 0 0 0 0 1 0 + 2 1 1 2 1 -1 -1 -2 -1 1 -2 -1 1 -2 2 1 + 0 1 0 1 1 -1 0 -1 -1 1 0 0 0 -1 1 1 + 0 2 -1 1 1 -1 2 -2 -2 2 1 1 -1 -1 1 1 + 0 1 -1 2 1 -1 1 -2 -1 1 2 1 -1 -2 2 1 + 0 -1 1 -1 -1 2 1 -1 -1 2 1 1 -2 -1 2 2 + 0 -2 1 -1 1 1 2 -2 2 2 1 -1 -1 1 1 -1 + 0 -1 1 -1 0 1 1 -1 0 1 1 0 -1 0 1 0 + 0 -1 1 -2 1 1 1 -2 1 1 2 -1 -1 2 2 -1 + 0 -1 1 -1 1 2 1 -1 1 2 1 -1 -2 1 2 -2 + 0 0 0 0 0 0 1 -1 -1 1 1 1 -1 -1 1 1 + 0 1 -2 1 -1 1 2 -1 1 -1 2 -2 2 1 -1 1 + 0 1 -1 0 -1 1 1 0 1 -1 0 -1 1 0 0 1 + 0 0 0 0 0 0 -1 -1 1 1 -1 1 1 1 1 -1 + 0 1 1 2 -1 -1 -1 -2 1 1 -2 1 1 2 2 -1 + 2 -1 -2 1 -1 1 -2 1 -1 1 2 -2 2 1 -1 1 + 0 -1 -1 -1 1 2 -1 -1 1 2 -1 1 2 1 2 -2 + 2 1 -1 -1 -2 1 1 1 2 -1 -1 -2 1 -2 1 2 + 2 -1 1 -2 -1 1 1 -2 -1 1 2 1 -1 -2 2 1 + 2 0 -1 0 -1 0 0 0 0 0 0 -1 0 0 0 0 + 0 0 -1 1 -1 1 0 0 0 0 1 -1 1 1 -1 1 + 0 2 -2 2 -2 2 1 -1 1 -1 1 -1 1 1 -1 1 + 2 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 -1 + 0 0 0 0 0 0 0 0 0 0 1 0 -1 0 1 0 + 0 0 -1 1 0 0 0 0 0 0 1 0 0 0 0 0 + 0 1 1 0 0 0 -1 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 -1 1 0 0 1 0 0 0 0 0 + 0 -1 0 1 1 1 0 1 1 1 0 0 0 -1 -1 -1 + 2 1 1 -2 -1 -1 -1 2 1 1 2 1 1 -2 -2 -1 + 0 2 1 -1 -1 -1 -2 2 2 2 1 1 1 -1 -1 -1 + 0 0 -1 1 1 1 0 0 0 0 1 1 1 -1 -1 -1 + 0 -1 -1 2 1 1 -1 2 1 1 2 1 1 -2 -2 -1 + 0 0 0 0 0 0 -1 1 1 1 1 1 1 -1 -1 -1 + 0 0 0 0 0 0 0 1 1 0 0 0 0 -1 0 0 + 0 1 1 -1 0 1 -1 1 0 -1 1 0 -1 0 1 0 + 0 0 0 0 0 0 0 0 0 0 1 1 0 -1 0 0 + 0 1 1 -1 -1 0 -1 1 1 0 1 1 0 -1 0 0 + 0 0 0 0 0 0 0 1 0 1 0 0 0 0 -1 0 + 0 1 1 -1 1 0 -1 1 -1 0 1 -1 0 1 0 0 + 0 1 0 -1 0 0 0 1 0 0 0 0 0 0 0 0 + 2 2 1 -1 1 1 -2 2 -2 -2 1 -1 -1 1 1 -1 + 0 2 2 -2 2 2 -1 1 -1 -1 1 -1 -1 1 1 -1 + 0 1 1 -2 1 1 -1 2 -1 -1 2 -1 -1 2 2 -1 + 0 1 1 -2 1 -1 -1 2 -1 1 2 -1 1 2 -2 1 + 0 1 0 -1 1 -1 0 1 -1 1 0 0 0 1 -1 1 + 0 1 1 -1 0 -1 -1 1 0 1 1 0 1 0 -1 0 + 2 0 0 -1 0 -1 0 0 0 0 0 0 0 0 -1 0 + 0 0 1 -1 1 -1 0 0 0 0 1 -1 1 1 -1 1 + 0 2 2 -2 2 -2 -1 1 -1 1 1 -1 1 1 -1 1 + 2 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 -1 + 0 0 1 -1 0 0 0 0 0 0 1 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 1 0 1 0 -1 0 + 2 1 1 1 1 0 -1 -1 -1 0 -1 -1 0 -1 0 0 + 2 0 0 0 0 0 0 -1 -1 0 0 0 0 -1 0 0 + 0 0 0 0 0 0 0 0 -1 1 0 0 0 0 0 1 + 0 -1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 + 0 0 0 0 -1 1 0 0 0 0 0 0 0 0 0 1 + 2 -1 -1 -1 -1 2 -1 -1 -1 2 -1 -1 2 -1 2 2 + 6 -1 -1 -1 -2 1 -1 -1 -2 1 -1 -2 1 -2 1 2 + 2 0 -1 -1 -1 1 0 0 0 0 -1 -1 1 -1 1 1 + 2 -1 -1 0 -1 1 -1 0 -1 1 0 -1 1 0 0 1 + 2 -1 0 -1 -1 1 0 -1 -1 1 0 0 0 -1 1 1 + 2 0 0 0 0 0 -1 -1 -1 1 -1 -1 1 -1 1 1 + 2 1 1 1 2 -1 -1 -1 -2 1 -1 -2 1 -2 1 2 + 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 1 1 + 0 0 0 -1 0 1 0 0 0 0 0 0 0 0 1 0 + 2 0 0 0 0 0 0 0 0 0 -1 -1 0 -1 0 0 + 0 0 0 0 0 0 0 0 0 0 0 -1 1 0 0 1 + 0 0 -1 0 0 1 0 0 0 0 0 0 1 0 0 0 + 0 0 0 0 0 0 -1 0 0 1 0 0 1 0 0 0 + 2 1 2 1 1 -1 -2 -1 -1 1 -2 -2 2 -1 1 1 + 0 1 1 0 1 -1 -1 0 -1 1 0 -1 1 0 0 1 + 0 2 1 -1 1 -1 -2 2 -2 2 1 -1 1 1 -1 1 + 0 1 2 -1 1 -1 -2 1 -1 1 2 -2 2 1 -1 1 + 0 1 1 1 0 -1 -1 -1 0 1 -1 0 1 0 1 0 + 0 2 1 1 -1 -1 -2 -2 2 2 -1 1 1 1 1 -1 + 0 1 1 1 -1 -2 -1 -1 1 2 -1 1 2 1 2 -2 + 0 1 2 1 -1 -1 -2 -1 1 1 -2 2 2 1 1 -1 + 0 1 1 -1 1 -2 -1 1 -1 2 1 -1 2 1 -2 2 + 0 -2 -1 1 1 1 -2 2 2 2 1 1 1 -1 -1 -1 + 0 -1 -1 1 0 1 -1 1 0 1 1 0 1 0 -1 0 + 0 -1 -2 1 1 1 -2 1 1 1 2 2 2 -1 -1 -1 + 0 -1 -1 1 1 2 -1 1 1 2 1 1 2 -1 -2 -2 + 0 -1 -1 1 -1 2 -1 1 -1 2 1 -1 2 1 -2 2 + 0 1 1 -2 -1 1 -1 2 1 -1 2 1 -1 -2 2 1 + 0 1 0 -1 -1 1 0 1 1 -1 0 0 0 -1 1 1 + 2 0 0 -1 -1 0 0 0 0 0 0 0 0 -1 0 0 + 0 0 1 -1 -1 1 0 0 0 0 1 1 -1 -1 1 1 + 0 2 2 -2 -2 2 -1 1 1 -1 1 1 -1 -1 1 1 + 0 0 0 0 0 0 -1 1 -1 1 1 -1 1 1 -1 1 + 0 1 1 -1 2 -1 -1 1 -2 1 1 -2 1 2 -1 2 + 6 1 -1 -2 -1 -1 1 2 1 1 -2 -1 -1 -2 -2 -1 + 2 0 0 0 0 0 -1 0 -1 0 0 -1 0 0 0 0 + 6 1 1 1 2 1 -1 -1 -2 -1 -1 -2 -1 -2 -1 -2 + 2 1 1 1 0 1 -1 -1 0 -1 -1 0 -1 0 -1 0 + 2 0 0 0 0 0 0 -1 0 -1 0 0 0 0 -1 0 + 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 1 + 0 -1 0 0 1 0 0 0 1 0 0 0 0 0 0 0 + 0 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 1 + 2 -1 -1 -1 2 -1 -1 -1 2 -1 -1 2 -1 2 -1 2 + 6 -1 -1 -1 1 -2 -1 -1 1 -2 -1 1 -2 1 -2 2 + 2 0 -1 -1 1 -1 0 0 0 0 -1 1 -1 1 -1 1 + 2 -1 -1 0 1 -1 -1 0 1 -1 0 1 -1 0 0 1 + 2 -1 0 -1 1 -1 0 -1 1 -1 0 0 0 1 -1 1 + 2 0 0 0 0 0 -1 -1 1 -1 -1 1 -1 1 -1 1 + 2 1 1 1 -1 2 -1 -1 1 -2 -1 1 -2 1 -2 2 + 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 1 + 0 0 0 -1 1 0 0 0 0 0 0 0 0 1 0 0 + 2 0 0 0 0 0 0 0 0 0 -1 0 -1 0 -1 0 + 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 1 + 0 0 -1 0 1 0 0 0 0 0 0 1 0 0 0 0 + 0 0 0 0 0 0 -1 0 1 0 0 1 0 0 0 0 + 0 1 1 0 -1 1 -1 0 1 -1 0 1 -1 0 0 1 + 0 2 1 -1 -1 1 -2 2 2 -2 1 1 -1 -1 1 1 + 2 1 2 1 -1 1 -2 -1 1 -1 -2 2 -2 1 -1 1 + 0 1 2 -1 -1 1 -2 1 1 -1 2 2 -2 -1 1 1 + 0 -1 -1 1 1 0 -1 1 1 0 1 1 0 -1 0 0 + 0 -1 -1 1 2 1 -1 1 2 1 1 2 1 -2 -1 -2 + 0 -1 -1 1 2 -1 -1 1 2 -1 1 2 -1 -2 1 2 + 0 0 0 0 0 0 -1 1 1 -1 1 1 -1 -1 1 1 + 2 0 0 0 0 0 -1 -1 0 0 -1 0 0 0 0 0 + 6 1 1 2 1 1 -1 -2 -1 -1 -2 -1 -1 -2 -2 -1 + 0 1 -1 1 1 -2 1 -1 -1 2 1 1 -2 -1 2 2 + 0 -1 1 1 -2 1 1 1 -2 1 -1 2 -1 2 -1 2 + 6 -1 -1 -2 -1 1 -1 -2 -1 1 -2 -1 1 -2 2 1 + 2 -1 -1 -1 0 1 -1 -1 0 1 -1 0 1 0 1 0 + 0 -1 1 1 -1 2 1 1 -1 2 -1 1 -2 1 -2 2 + 0 1 -1 1 2 -1 1 -1 -2 1 1 2 -1 -2 1 2 + 0 1 -1 1 -2 1 1 -1 2 -1 1 -2 1 2 -1 2 + 0 -1 1 1 1 -2 1 1 1 -2 -1 -1 2 -1 2 2 + 0 -1 1 1 2 -1 1 1 2 -1 -1 -2 1 -2 1 2 + 6 -1 -1 -2 1 -1 -1 -2 1 -1 -2 1 -1 2 -2 1 + 2 -1 -1 -1 1 0 -1 -1 1 0 -1 1 0 1 0 0 + 2 -2 -2 -2 2 2 -1 -1 1 1 -1 1 1 1 1 -1 + 0 -2 2 -2 2 2 1 -1 1 1 1 -1 -1 1 1 -1 + 0 -1 0 -1 1 1 0 -1 1 1 0 0 0 1 1 -1 + 2 -1 -1 -2 1 1 -1 -2 1 1 -2 1 1 2 2 -1 + 2 -1 0 -1 0 0 0 -1 0 0 0 0 0 0 0 0 + 12 -2 -2 -2 -2 -2 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 + 12 -1 -1 -2 -1 -1 -1 -2 -1 -1 -2 -1 -1 -2 -2 -1 + 6 -1 1 -2 -1 -1 1 -2 -1 -1 2 1 1 -2 -2 -1 + 6 -1 0 -1 -1 -1 0 -1 -1 -1 0 0 0 -1 -1 -1 + 6 -2 1 -1 -1 -1 2 -2 -2 -2 1 1 1 -1 -1 -1 + 0 1 -1 1 -1 2 1 -1 1 -2 1 -1 2 1 -2 2 + 0 2 -2 -2 2 2 1 1 -1 -1 -1 1 1 1 1 -1 + 0 0 -1 -1 1 1 0 0 0 0 -1 1 1 1 1 -1 + 2 0 -1 -1 0 0 0 0 0 0 -1 0 0 0 0 0 + 0 1 1 -1 -2 1 -1 1 2 -1 1 2 -1 -2 1 2 + 0 -2 -2 2 2 2 -1 1 1 1 1 1 1 -1 -1 -1 + 0 -1 -1 0 1 1 -1 0 1 1 0 1 1 0 0 -1 + 2 -1 -2 -1 1 1 -2 -1 1 1 -2 2 2 1 1 -1 + 0 1 1 -1 -1 2 -1 1 1 -2 1 1 -2 -1 2 2 + 6 1 2 1 1 1 -2 -1 -1 -1 -2 -2 -2 -1 -1 -1 + 6 2 -2 -2 -2 -2 1 1 1 1 -1 -1 -1 -1 -1 -1 + 6 2 1 1 1 1 -2 -2 -2 -2 -1 -1 -1 -1 -1 -1 + 6 -2 2 -2 -2 -2 1 -1 -1 -1 1 1 1 -1 -1 -1 + 6 -2 -2 2 -2 -2 -1 1 -1 -1 1 -1 -1 1 1 -1 + 2 -1 -1 0 0 0 -1 0 0 0 0 0 0 0 0 0 + 12 -1 -2 -1 -1 -1 -2 -1 -1 -1 -2 -2 -2 -1 -1 -1 + 6 -1 -2 1 -1 -1 -2 1 -1 -1 2 -2 -2 1 1 -1 + 6 -1 -1 0 -1 -1 -1 0 -1 -1 0 -1 -1 0 0 -1 + 6 -2 -1 1 -1 -1 -2 2 -2 -2 1 -1 -1 1 1 -1 + 6 -1 -2 -1 1 -1 -2 -1 1 -1 -2 2 -2 1 -1 1 + 6 -2 -2 -2 2 -2 -1 -1 1 -1 -1 1 -1 1 -1 1 + 6 -1 -1 -1 0 -1 -1 -1 0 -1 -1 0 -1 0 -1 0 + 6 -2 -1 -1 1 -1 -2 -2 2 -2 -1 1 -1 1 -1 1 + 12 -2 -1 -1 -1 -1 -2 -2 -2 -2 -1 -1 -1 -1 -1 -1 + 6 -1 -2 -1 -1 1 -2 -1 -1 1 -2 -2 2 -1 1 1 + 6 -2 -2 -2 -2 2 -1 -1 -1 1 -1 -1 1 -1 1 1 + 6 -1 -1 -1 -1 0 -1 -1 -1 0 -1 -1 0 -1 0 0 + 6 -2 -1 -1 -1 1 -2 -2 -2 2 -1 -1 1 -1 1 1 + 6 0 -1 -1 -1 -1 0 0 0 0 -1 -1 -1 -1 -1 -1 + 6 1 -2 -1 -1 -1 2 1 1 1 -2 -2 -2 -1 -1 -1 + 6 0 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 + 2 0 0 0 0 0 -1 0 0 -1 0 0 -1 0 0 0 + 6 1 1 1 1 2 -1 -1 -1 -2 -1 -1 -2 -1 -2 -2 +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/lrsgmp.h new/lrslib-071b/lrsgmp.h --- old/lrslib-071a/lrsgmp.h 2020-10-17 08:18:41.000000000 +0200 +++ new/lrslib-071b/lrsgmp.h 2020-11-17 02:10:48.000000000 +0100 @@ -165,6 +165,7 @@ #define itomp(in, a) fmpz_set_si( (a) , (in) ) #define mptoi(a) fmpz_get_si( (a) ) #define mptodouble(a) fmpz_get_d ( (a) ) + #define mpgetstr10(a,c) mpgetstr(a,10,c) #define mpgetstr(a,b,c) fmpz_get_str((a),(b),(c)) #define mpoutstr(a,b,c) fmpz_fprint((a),(c)) /* had a (b) */ #define mulint(a, b, c) fmpz_mul((c),(a),(b)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/lrslib.c new/lrslib-071b/lrslib.c --- old/lrslib-071a/lrslib.c 2020-10-17 08:18:46.000000000 +0200 +++ new/lrslib-071b/lrslib.c 2021-06-02 10:42:36.000000000 +0200 @@ -991,7 +991,6 @@ } else if (firstline) { -// printf("\nov=%ld mess=%ld",overflow,Q->messages); if(overflow != 2) lrs_warning(Q,"warning",name); firstline = FALSE; @@ -1577,7 +1576,7 @@ sprintf(mess,"*seed=%ld",Q->seed); if(overflow != 2) lrs_warning(Q,"warning",mess); - srandom(Q->seed); + srand(Q->seed); } if (strcmp (name, "estimates") == 0) @@ -5671,7 +5670,7 @@ for ( i = 0; i < d; i++) { - j = random() % (d-i) + i; + j = rand() % (d-i) + i; t = perm[j]; perm[j] = perm[i]; perm[i] = t; // Swap i and j } if(Q->debug) @@ -6253,36 +6252,19 @@ } -#ifdef GMP - /* compiled with gmp arithmetic */ - -long lrsgmp_main(int argc, char *argv[],lrs_dic **P_orig, lrs_dat **Q,long overf,long stage,char *tmp, lrs_restart_dat *R) -{ - return lrsv2_main(argc,argv,P_orig,Q,overf,stage,tmp,R); -} - - -#elif defined(LRSLONG) - -#ifdef B128 - +#ifdef LRSLONG +#ifdef B128 long lrs2_main(int argc, char *argv[],lrs_dic **P_orig, lrs_dat **Q,long overf,long stage,char *tmp, lrs_restart_dat *R) -{ - return lrsv2_main(argc,argv,P_orig,Q,overf,stage,tmp,R); -} - - #else - -long lrs1_main(int argc, char *argv[],lrs_dic **P_orig, lrs_dat **Q,long overf,long stage,char *tmp, lrs_restart_dat *R) +long lrs1_main(int argc, char *argv[],lrs_dic **P_orig, lrs_dat **Q,long overf,long stage,char *tmp, lrs_restart_dat *R) +#endif +#else +long lrsgmp_main(int argc, char *argv[],lrs_dic **P_orig, lrs_dat **Q,long overf,long stage,char *tmp, lrs_restart_dat *R) +#endif { return lrsv2_main(argc,argv,P_orig,Q,overf,stage,tmp,R); } -#endif -#endif - - long lrs_main(int argc, char *argv[]) /* legacy version, replaced by lrsv2_main but still maintained */ @@ -6382,7 +6364,9 @@ /* overflow occurred */ - if (R->redund ) +//2021.5.19 Eric Peteren bug fix, not sure if mplrs really uses this but lrs should not! +// if ( R->redund ) + if ((*Q)->mplrs && R->redund ) { if(R->redineq != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/lrslib.h new/lrslib-071b/lrslib.h --- old/lrslib-071a/lrslib.h 2020-10-17 08:18:46.000000000 +0200 +++ new/lrslib-071b/lrslib.h 2021-06-02 10:42:36.000000000 +0200 @@ -1,6 +1,6 @@ /* lrslib.h (vertex enumeration using lexicographic reverse search) */ #define TITLE "lrslib " -#define VERSION "v.7.1 2020.10.17" +#define VERSION "v.7.1 2021.6.2" #define AUTHOR "*Copyright (C) 1995,2020, David Avis [email protected] " /* This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/lrsnashlib.c new/lrslib-071b/lrsnashlib.c --- old/lrslib-071a/lrsnashlib.c 2020-10-17 08:18:42.000000000 +0200 +++ new/lrslib-071b/lrsnashlib.c 2021-06-02 10:42:36.000000000 +0200 @@ -1116,4 +1116,5 @@ ((gInfo *)g->aux)->fwidth[col][pos] = len; } +void resetNashSolver() { FirstTime = TRUE; } /******************** end of lrsnashlib.c ***************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/lrsnashlib.h new/lrslib-071b/lrsnashlib.h --- old/lrslib-071a/lrsnashlib.h 2020-10-17 08:18:41.000000000 +0200 +++ new/lrslib-071b/lrsnashlib.h 2021-06-02 10:42:36.000000000 +0200 @@ -63,6 +63,7 @@ void FillNonnegativityRows(lrs_dic * P, lrs_dat * Q, int firstRow, int lastRow, int n); void printGame(game * g); void setFwidth(game *g, int len); +void resetNashSolver(); /* Call this function for every new game to be solved */ void initFwidth(game *g); void updateFwidth(game *g, int col, int pos, char *str); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/makefile new/lrslib-071b/makefile --- old/lrslib-071a/makefile 2020-10-17 08:18:42.000000000 +0200 +++ new/lrslib-071b/makefile 2021-06-02 10:42:36.000000000 +0200 @@ -8,7 +8,7 @@ #try uncommenting next line if cc is the default C compiler #CC = gcc -default: lrs +default: lrs lrsgmp #choose line below instead if __int128 not supported #default: lrs64 lrsgmp @@ -25,7 +25,7 @@ #make allmp uses native mp and long arithmetic #make demo various demo programs for lrslib #make lrsnash Nash equilibria for 2-person games: lrsnash (gmp), lrsnash1 (64bit), lrsnash2 (128bit) -#make fourier Fourier elimination (buggy, needs fixing) +#make fel Fourier elimination (buggy, needs fixing) #make clean removes binaries #INCLUDEDIR = /usr/include @@ -35,7 +35,7 @@ INCLUDEDIR = /usr/local/include LIBDIR = /usr/local/lib -CFLAGS = -O3 -Wall +CFLAGS ?= -O3 -Wall #CFLAGS = -g -Wall #use this if you want only output file contain data between begin/end lines @@ -44,24 +44,39 @@ SHLIB_CFLAGS = -fPIC mpicxx=mpicc + +# for 32 bit machines + +# BITS=-DB32 +# MPLRSOBJ2= + +# for 64 bit machines +BITS=-DB128 +MPLRSOBJ2=lrslib2-mplrs.o lrslong2-mplrs.o + + LRSOBJ=lrs.o lrslong1.o lrslong2.o lrslib1.o lrslib2.o lrslibgmp.o lrsgmp.o lrsdriver.o -MPLRSOBJ=lrslong1-mplrs.o lrslong2-mplrs.o lrslib1-mplrs.o lrslib2-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs.o +LRSOBJMP=lrs.o lrslong1.o lrslong2.o lrslib1.o lrslib2.o lrslibmp.o lrsmp.o lrsdriver.o +MPLRSOBJ=lrslong1-mplrs.o lrslib1-mplrs.o ${MPLRSOBJ2} lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs.o LRSOBJ64=lrs64.o lrslong1.o lrslib1.o lrslibgmp.o lrsgmp.o lrsdriver.o MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs64.o lrs: ${LRSOBJ} - $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp - $(CC) -O3 -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp + $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp + $(CC) -O3 hvref.c -o hvref + ln -s -f lrs redund + +lrsmp: ${LRSOBJMP} + $(CC) ${CFLAGS} -DMA ${BITS} -o lrsmp ${LRSOBJMP} $(CC) -O3 hvref.c -o hvref ln -s -f lrs redund - ln -s -f lrsgmp redundgmp lrs64: ${LRSOBJ64} $(CC) ${CFLAGS} -DMA -L${LIBDIR} -o lrs ${LRSOBJ64} -lgmp lrs.o: lrs.c - $(CC) ${CFLAGS} -DMA -DB128 -c -o lrs.o lrs.c + $(CC) ${CFLAGS} -DMA ${BITS} -c -o lrs.o lrs.c lrs64.o: lrs.c $(CC) ${CFLAGS} -DMA -c -o lrs64.o lrs.c @@ -70,32 +85,40 @@ $(CC) ${CFLAGS} -DMA -DSAFE -DLRSLONG -c -o lrslong1.o lrslong.c lrslong2.o: lrslong.c lrslong.h - $(CC) ${CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o lrslong2.o lrslong.c + $(CC) ${CFLAGS} -DMA -DSAFE ${BITS} -DLRSLONG -c -o lrslong2.o lrslong.c lrslib1.o: lrslib.c lrslib.h $(CC) ${CFLAGS} -DMA -DSAFE -DLRSLONG -c -o lrslib1.o lrslib.c lrslib2.o: lrslib.c lrslib.h - $(CC) ${CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o lrslib2.o lrslib.c + $(CC) ${CFLAGS} -DMA -DSAFE ${BITS} -DLRSLONG -c -o lrslib2.o lrslib.c lrslibgmp.o: lrslib.c lrslib.h - $(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrslibgmp.o lrslib.c + $(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrslibgmp.o lrslib.c + +lrslibmp.o: lrslib.c lrslib.h + $(CC) ${CFLAGS} -DMA -DMP -c -o lrslibmp.o lrslib.c lrsgmp.o: lrsgmp.c lrsgmp.h $(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrsgmp.o lrsgmp.c +lrsmp.o: lrsmp.c lrsmp.h + $(CC) ${CFLAGS} -DMA -DMP -c -o lrsmp.o lrsmp.c + +checkpred: checkpred.c lrsgmp.h lrsgmp.c + $(CC) $(CFLAGS) -DGMP -lgmp -o checkpred checkpred.c lrsgmp.c lrslong1-mplrs.o: lrslong.c lrslong.h $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DLRSLONG -DPLRS -c -o lrslong1-mplrs.o lrslong.c lrslong2-mplrs.o: lrslong.c lrslong.h - $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DB128 -DLRSLONG -DPLRS -c -o lrslong2-mplrs.o lrslong.c + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE ${BITS} -DLRSLONG -DPLRS -c -o lrslong2-mplrs.o lrslong.c lrslib1-mplrs.o: lrslib.c lrslib.h $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DLRSLONG -DPLRS -c -o lrslib1-mplrs.o lrslib.c lrslib2-mplrs.o: lrslib.c lrslib.h - $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DB128 -DLRSLONG -DPLRS -c -o lrslib2-mplrs.o lrslib.c + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE ${BITS} -DLRSLONG -DPLRS -c -o lrslib2-mplrs.o lrslib.c lrslibgmp-mplrs.o: lrslib.c lrslib.h $(mpicxx) ${CFLAGS} -DMA -DTIMES -DSIGNALS -DGMP -DPLRS -I${INCLUDEDIR} -c -o lrslibgmp-mplrs.o lrslib.c @@ -107,13 +130,13 @@ $(mpicxx) $(CFLAGS) -c -o lrsdriver-mplrs.o lrsdriver.c mplrs.o: mplrs.c mplrs.h lrslib.h lrsgmp.h - $(mpicxx) ${CFLAGS} -I${INCLUDEDIR} -DMA -DPLRS -DTIMES -DB128 -DSIGNALS -D_WITH_GETLINE -c -o mplrs.o mplrs.c + $(mpicxx) ${CFLAGS} -I${INCLUDEDIR} -DMA -DPLRS -DTIMES ${BITS} -DSIGNALS -D_WITH_GETLINE -c -o mplrs.o mplrs.c mplrs64.o: mplrs.c mplrs.h lrslib.h lrsgmp.h $(mpicxx) ${CFLAGS} -I${INCLUDEDIR} -DMA -DPLRS -DTIMES -DSIGNALS -D_WITH_GETLINE -c -o mplrs64.o mplrs.c mplrs: ${MPLRSOBJ} mplrsgmp - $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA -DB128 -L${LIBDIR} -o mplrs ${MPLRSOBJ} -lgmp + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA ${BITS} -L${LIBDIR} -o mplrs ${MPLRSOBJ} -lgmp mplrs64: ${MPLRSOBJ64} mplrsgmp $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA -L${LIBDIR} -o mplrs ${MPLRSOBJ64} -lgmp @@ -122,10 +145,10 @@ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -o mplrsgmp -lgmp mplrs1: mplrs.c mplrs.h lrslib.c lrslib.h lrslong.c lrslong.h lrsdriver.h lrsdriver.c - $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs1 + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DLRSLONG mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs1 mplrs2: mplrs.c mplrs.h lrslib.c lrslib.h lrslong.c lrslong.h lrsdriver.h lrsdriver.c - $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG -DB128 mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs2 + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs2 mplrsmp: mplrs.c mplrs.h lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS mplrs.c lrslib.c lrsmp.c lrsdriver.c -o mplrsmp @@ -134,27 +157,29 @@ flint: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not found; exit 1; } - $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp + $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint -o lrsflint -lgmp +# $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.c lrsdriver.h ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp -#comment out lines with -DB128 if __int128 not supported by your C compiler +#comment out lines with ${BITS} if __int128 not supported by your C compiler lrsgmp: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c - $(CC) -O3 -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp + $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp + ln -s -f lrsgmp redundgmp single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c - $(CC) -O3 -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c - $(CC) -O3 -DB128 -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c + $(CC) ${CFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c + $(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c ln -s -f lrs1 redund1 ln -s -f lrs2 redund2 allmp: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c $(CC) -Wall -O3 -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c $(CC) -Wall -O3 -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c - $(CC) -Wall -O3 -DSAFE -DLRSLONG -DB128 -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c - $(CC) -O3 -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c + $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c + $(CC) -O3 -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static $(CC) -O3 -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c $(CC) -O3 -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c $(CC) -O3 -o 2nash 2nash.c @@ -169,13 +194,15 @@ lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h lrsgmp.c lrsgmp.h lrslong.h lrsdriver.h lrsdriver.c $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE - $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE -DB128 + $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o 2nash 2nash.c cp lrsnashgmp lrsnash -fourier: fourier.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c - $(CC) -O3 -DGMP -I${INCLUDEDIR} fourier.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp -o fourier +fel: fel.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c lrslong.c + $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp -o felgmp + $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE -o fel1 + $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} -o fel2 ###################################################################### # From here on the author is David Bremner <[email protected]> to whom you should turn for help @@ -186,8 +213,15 @@ SHLIB ?=$(SONAME)$(SOMINOR) SHLINK ?=liblrs.so -SHLIBOBJ=lrslong1-shr.o lrslong2-shr.o lrslib1-shr.o lrslib2-shr.o \ - lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o +SHLIBOBJ2=lrslib2-shr.o lrslong2-shr.o + +# for 32 bit machines + +# SHLIBOBJ2= + +SHLIBOBJ=lrslong1-shr.o lrslib1-shr.o \ + lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o \ + ${SHLIBOBJ2} SHLIBBIN=lrs-shared lrsnash-shared @@ -206,12 +240,17 @@ all-shared: ${SHLIBBIN} -lrs-shared: ${SHLINK} lrs.o - $(CC) lrs.o -o $@ -L . -llrs +lrs-shared: ${SHLINK} lrs-shared.o + $(CC) $^ -o $@ -L . -llrs lrsnash-shared: ${SHLINK} lrsnash.c - $(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp + $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp + +# driver object files + +lrs-shared.o: lrs.c + $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} -c -o $@ lrs.c # build object files for the shared library @@ -225,7 +264,7 @@ $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DSAFE -DLRSLONG -c -o $@ lrslong.c lrslong2-shr.o: lrslong.c lrslong.h - $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o $@ lrslong.c + $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DSAFE ${BITS} -DLRSLONG -c -o $@ lrslong.c lrslibgmp-shr.o: lrslib.c lrslib.h $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o $@ lrslib.c @@ -234,13 +273,13 @@ $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o $@ lrsgmp.c lrslib2-shr.o: lrslib.c lrslib.h - $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o $@ lrslib.c + $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -DMA -DSAFE ${BITS} -DLRSLONG -c -o $@ lrslib.c ###################################################################### # install targets # where to install binaries, libraries, include files prefix ?= /usr/local -INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h +INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h lrsrestart.h install: all-shared install-common mkdir -p $(DESTDIR)${prefix}/bin @@ -257,6 +296,6 @@ ###################################################################### clean: rm -f lrs lrs1 lrsgmp lrs1n lpdemo lpdemo1 lpdemo2 mplrs1 mplrs mplrsmp mplrsgmp lrs2 mplrs2 lrsflint mplrsflint *.o *.exe *.so - rm -f hvref setnash setnash2 fourier lrsnashgmp lrsnash lrsnash1 lrsnash2 nashdemo 2nash vedemo + rm -f hvref setnash setnash2 fel1 fel1 felgmp lrsnashgmp lrsnash lrsnash1 lrsnash2 nashdemo 2nash vedemo rm -f ${LRSOBJ} ${LRSOBJ64} ${SHLIBOBJ} ${SHLIB} ${SONAME} ${SHLINK} rm -f ${SHLIBBIN} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrslib-071a/redundgmp new/lrslib-071b/redundgmp --- old/lrslib-071a/redundgmp 2021-11-03 17:26:39.313349999 +0100 +++ new/lrslib-071b/redundgmp 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to lrsgmp
