Change to 3.5.1

Normaliz · Jan 4, 2018 · f80857d · f80857d
1 parent ab979d8
commit f80857d
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 22 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 # ChangeLog
 
+## [3.5.1] 2016-01-15
+
+-- Uniqueness in output of not uniqely determined results (bases of sublattices, equations),
+   necessary to make all tests yield the same results on all systems
+
 ## [3.5.0] 2017-12-11
 
 -- LLL reduced coordinates for coordinate dependent algorithms

diff --git a/Qsource/libQnormaliz/Qversion.h b/Qsource/libQnormaliz/Qversion.h
@@ -4,7 +4,7 @@
 #define QNMZ_VERSION_MAJOR  3
 #define QNMZ_VERSION_MINOR  2
 #define QNMZ_VERSION_PATCH  1
-#define QNMZ_VERSION        3.5.0
+#define QNMZ_VERSION        3.5.1
 #define QNMZ_RELEASE (QNMZ_VERSION_MAJOR * 10000 + QNMZ_VERSION_MINOR * 100 + QNMZ_VERSION_PATCH)
 
 namespace libQnormaliz {

diff --git a/configure.ac b/configure.ac
@@ -2,10 +2,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(Normaliz, 3.5.0)
+AC_INIT(Normaliz, 3.5.1)
 AC_SUBST(LIBNORMALIZ_VERSION_MAJOR, 3)
 AC_SUBST(LIBNORMALIZ_VERSION_MINOR, 5)
-AC_SUBST(LIBNORMALIZ_VERSION_PATCH, 0)
+AC_SUBST(LIBNORMALIZ_VERSION_PATCH, 1)
 AC_SUBST(LIBNORMALIZ_VERSION_STRING, "$PACKAGE_VERSION")
 AC_SUBST(LIBQNORMALIZ_VERSION_MAJOR, 3)
 AC_SUBST(LIBQNORMALIZ_VERSION_MINOR, 2)

diff --git a/doc/Normaliz.pdf b/doc/Normaliz.pdf
diff --git a/doc/Normaliz.tex b/doc/Normaliz.tex
@@ -123,7 +123,7 @@
 
 \def\ttt{\texttt}
 
-\def\version{3.5.0}
+\def\version{3.5.1}
 \def\NmzDir{normaliz-\version}
 
 
@@ -299,6 +299,12 @@ \subsection{Major changes relative to version 3.1.1}
 	\item install scripts.
 \end{arab}
 
+In 3.5.1:
+
+\begin{arab}
+	\item Unique output of bases of sublattices and equations (necessary for tests on old systems where LLL can produce different results).
+\end{arab}
+
 See the file \verb|CHANGELOG| in the basic package for more information on the history of Normaliz.
 
 
@@ -1208,17 +1214,17 @@ \subsection{Magic squares}\label{eq_ex}
 
 These $4$ support hyperplanes cut out the cone generated by the magic squares from the linear subspace they generate. Only one is reproduced as a sign inequality. This is due to the fact that the linear subspace has submaximal dimension and there is no unique lifting of linear forms to the full space.
 \begin{Verbatim}
-6 equations:                  3 basis elements of lattice:
--1  0 1 -1  1  0 0 0  0        1 0 -1 -2 0  2  1  0 -1
--1 -1 0  0  1  0 1 0  0        0 1 -1 -1 0  1  1 -1  0
- 0  0 1 -1  0 -1 1 0  0        0 0  3  4 1 -2 -1  2  2
- 0  1 0 -1  0 -1 0 1  0
- 0  0 1 -1 -1  0 0 0  1
- 0  0 0  1 -1  0 1 0 -1
+6 equations:                 3 basis elements of lattice:
+1 0 0 0 0  1 -2 -1  1        1 0 -1 -2 0  2  1  0 -1
+0 1 0 0 0  1 -2  0  0        0 1 -1 -1 0  1  1 -1  0
+0 0 1 0 0  1 -1 -1  0        0 0  3  4 1 -2 -1  2  2
+0 0 0 1 0 -1  2  0 -2
+0 0 0 0 1 -1  1  0 -1
+0 0 0 0 0  3 -4 -1  2
 \end{Verbatim}
 So one of our equations has turned out to be superfluous (why?). Note that also the equations are not reproduced exactly. Finally, Normaliz lists a basis of the efficient lattice $\EE$  generated by the magic squares. 
 
-Note that the equations and the lattice basis are not uniquely determined.
+Note that the equations and the lattice basis are not uniquely determined. We transform their matrices into reduced row echelon form to force unique output files.
 
 \subsubsection{With even corners}\label{magiceven}\label{cong_ex}
 
@@ -2015,8 +2021,8 @@ \subsection{The integer hull}\label{IntHull}
 0 0 1
 
 2 equations:
- 0 1 0
  1 0 0
+ 0 1 0
 
 1 basis elements of lattice:
  0 0 1
@@ -2779,7 +2785,7 @@ \subsubsection{Polyhedra}
 
 The Normaliz 2 input type \verb|polyhedron| can still be used.
 
-\subsubsection{Lattices}
+\subsubsection{Affine lattices}
 
 \begin{itemize}
 	\itemtt[offset] is a vector with $d$ entries. It defines the origin of the affine lattice.
@@ -2790,7 +2796,7 @@ \subsubsection{Lattices}
 
 \subsection{Inhomogeneous constraints}
 
-\subsubsection{Cones}
+\subsubsection{Polyhedra}
 
 \begin{itemize}
 	\itemtt[inhom\_inequalities] is a matrix with $d+1$ columns. We consider inequalities
@@ -2820,7 +2826,7 @@ \subsubsection{Cones}
 	\itemtt[strict\_signs] is a vector with $d$ components in $\{-1,0,1\}$. It is the ''strict'' counterpart to \verb|signs|. An entry $1$ in component $i$ represents the inequality $x_i>0$, an entry $-1$ the opposite inequality, whereas $0$ imposes no condition on $x_i$. \ref{strict_signs_ex}, \verb|Condorcet_one.in|
 \end{itemize}
 
-\subsubsection{Lattices}
+\subsubsection{Affine lattices}
 
 \begin{itemize}
 	\itemtt[inhom\_equations] is a matrix with $d+1$ columns. We consider equations

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -16,7 +16,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 PROJECT(libnormaliz)
 SET(VERSION_MAJOR 3)
 SET(VERSION_MINOR 5)
-SET(VERSION_PATCH 0)
+SET(VERSION_PATCH 1)
 SET(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(VERSION ${VERSION_STRING})
 

diff --git a/source/Makefile.am b/source/Makefile.am
@@ -36,8 +36,8 @@ noinst_HEADERS += libnormaliz/libnormaliz.cpp libnormaliz/integer.cpp libnormali
 # Sources included via nmz_integrate.cpp:
 noinst_HEADERS += libnormaliz/nmz_polynomial.cpp libnormaliz/nmz_integral.cpp
 
-libnormaliz_la_LDFLAGS = -version-info 8:0:5
-## yields version number 3.4.2 for libnormaliz.so on Linux
+libnormaliz_la_LDFLAGS = -version-info 8:1:5
+## yields version number 3.5.1 for libnormaliz.so on Linux
 ## Conjecture: x.y.z yields x-z.z.y
 libnormaliz_la_LIBADD = $(GMP_LDFLAGS) -lgmpxx -lgmp
 

diff --git a/source/libnormaliz/version.h b/source/libnormaliz/version.h
@@ -3,8 +3,8 @@
 
 #define NMZ_VERSION_MAJOR  3
 #define NMZ_VERSION_MINOR  5
-#define NMZ_VERSION_PATCH  0
-#define NMZ_VERSION        3.5.0
+#define NMZ_VERSION_PATCH  1
+#define NMZ_VERSION        3.5.1
 #define NMZ_RELEASE (NMZ_VERSION_MAJOR * 10000 + NMZ_VERSION_MINOR * 100 + NMZ_VERSION_PATCH)
 
 namespace libnormaliz {

diff --git a/source/normaliz.cpp b/source/normaliz.cpp
@@ -53,7 +53,7 @@ void printHeader() {
                                                  << "             \\....|"<<endl;
     cout << "                                                      \\...|"<<endl;
     cout << "     (C) The Normaliz Team, University of Osnabrueck   \\..|"<<endl;
-    cout << "                   December  2017                       \\.|"<<endl;
+    cout << "                    January  2018                       \\.|"<<endl;
     cout << "                                                         \\|"<<endl;
     bool with_optional_packages=false;
     string optional_packages;