From 6d08d8c0a84c1ffa31f5eb16e33b340727f46175 Mon Sep 17 00:00:00 2001 From: Vivien Maisonneuve Date: Wed, 20 Aug 2014 14:08:38 +0200 Subject: [PATCH 1/1] Mention that we use Z-polyhedra --- doc/reference.rst | 1 + doc/tutorial.rst | 4 ++-- linpy/polyhedra.py | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/reference.rst b/doc/reference.rst index 07ceaf3..56986c5 100644 --- a/doc/reference.rst +++ b/doc/reference.rst @@ -243,6 +243,7 @@ Polyhedra A *convex polyhedron* (or simply "polyhedron") is the space defined by a system of linear equalities and inequalities. This space can be unbounded. +A *Z-polyhedron* (simply called "polyhedron" in LinPy) is the set of integer points in a convex polyhedron. .. class:: Polyhedron(equalities, inequalities) Polyhedron(string) diff --git a/doc/tutorial.rst b/doc/tutorial.rst index b13a22e..67aecd6 100644 --- a/doc/tutorial.rst +++ b/doc/tutorial.rst @@ -10,8 +10,8 @@ For a comprehensive description of its functionalities, please consult the :ref: .. _tutorial_polyhedra: -Polyhedra ---------- +Z-Polyhedra +----------- The following example shows how we can manipulate polyhedra using LinPy. Let us define two square polyhedra, corresponding to the sets ``square1 = {(x, y) | 0 <= x <= 2, 0 <= y <= 2}`` and ``square2 = {(x, y) | 2 <= x <= 4, 2 <= y <= 4}``. diff --git a/linpy/polyhedra.py b/linpy/polyhedra.py index 4d7d1f3..f802151 100644 --- a/linpy/polyhedra.py +++ b/linpy/polyhedra.py @@ -37,8 +37,9 @@ __all__ = [ class Polyhedron(Domain): """ A convex polyhedron (or simply "polyhedron") is the space defined by a - system of linear equalities and inequalities. This space can be - unbounded. + system of linear equalities and inequalities. This space can be unbounded. A + Z-polyhedron (simply called "polyhedron" in LinPy) is the set of integer + points in a convex polyhedron. """ __slots__ = ( -- 2.20.1