Fix unitary tests

[linpy.git] / pypol / polyhedra.py

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index 63ecb644805d84cc761ee85695eef085117df125..9bfc64b29c1f696f2a10acfba5cf8baa5a5ebd67 100644 (file)
--- a/pypol/polyhedra.py
+++ b/pypol/polyhedra.py
@@ -1,9 +1,28 @@
+# Copyright 2014 MINES ParisTech
+#
+# This file is part of Linpy.
+#
+# Linpy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Linpy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Linpy.  If not, see <http://www.gnu.org/licenses/>.
+

 import functools
 import functools

+import math

 import numbers
 
 from . import islhelper
 
 from .islhelper import mainctx, libisl
 import numbers
 
 from . import islhelper
 
 from .islhelper import mainctx, libisl

+from .geometry import GeometricObject, Point

 from .linexprs import Expression, Rational
 from .domains import Domain
 
 from .linexprs import Expression, Rational
 from .domains import Domain
 


@@ -30,11 +49,7 @@ class Polyhedron(Domain):
             if inequalities is not None:
                 raise TypeError('too many arguments')
             return cls.fromstring(equalities)
             if inequalities is not None:
                 raise TypeError('too many arguments')
             return cls.fromstring(equalities)

-        elif isinstance(equalities, Polyhedron):
-            if inequalities is not None:
-                raise TypeError('too many arguments')
-            return equalities
-        elif isinstance(equalities, Domain):
+        elif isinstance(equalities, GeometricObject):

             if inequalities is not None:
                 raise TypeError('too many arguments')
             return equalities.aspolyhedron()
             if inequalities is not None:
                 raise TypeError('too many arguments')
             return equalities.aspolyhedron()


@@ -58,14 +73,23 @@ class Polyhedron(Domain):
 
     @property
     def equalities(self):
 
     @property
     def equalities(self):

+        """
+        Return a list of the equalities in a set.
+        """

         return self._equalities
 
     @property
     def inequalities(self):
         return self._equalities
 
     @property
     def inequalities(self):

+        """
+        Return a list of the inequalities in a set.
+        """

         return self._inequalities
 
     @property
     def constraints(self):
         return self._inequalities
 
     @property
     def constraints(self):

+        """
+        Return ta list of the constraints of a set.
+        """

         return self._constraints
 
     @property
         return self._constraints
 
     @property


@@ -73,9 +97,15 @@ class Polyhedron(Domain):
         return self,
 
     def disjoint(self):
         return self,
 
     def disjoint(self):

+        """
+        Return a set as disjoint.
+        """

         return self
 
     def isuniverse(self):
         return self
 
     def isuniverse(self):

+        """
+        Return true if a set is the Universe set.
+        """

         islbset = self._toislbasicset(self.equalities, self.inequalities,
             self.symbols)
         universe = bool(libisl.isl_basic_set_is_universe(islbset))
         islbset = self._toislbasicset(self.equalities, self.inequalities,
             self.symbols)
         universe = bool(libisl.isl_basic_set_is_universe(islbset))


@@ -83,15 +113,60 @@ class Polyhedron(Domain):
         return universe
 
     def aspolyhedron(self):
         return universe
 
     def aspolyhedron(self):

+        """
+        Return polyhedral hull of a set.
+        """

         return self
 
         return self
 

+    def __contains__(self, point):
+        if not isinstance(point, Point):
+            raise TypeError('point must be a Point instance')
+        if self.symbols != point.symbols:
+            raise ValueError('arguments must belong to the same space')
+        for equality in self.equalities:
+            if equality.subs(point.coordinates()) != 0:
+                return False
+        for inequality in self.inequalities:
+            if inequality.subs(point.coordinates()) < 0:
+                return False
+        return True
+

     def subs(self, symbol, expression=None):
     def subs(self, symbol, expression=None):

+        """
+        Subsitute the given value into an expression and return the resulting
+        expression.
+        """

         equalities = [equality.subs(symbol, expression)
             for equality in self.equalities]
         inequalities = [inequality.subs(symbol, expression)
             for inequality in self.inequalities]
         return Polyhedron(equalities, inequalities)
 
         equalities = [equality.subs(symbol, expression)
             for equality in self.equalities]
         inequalities = [inequality.subs(symbol, expression)
             for inequality in self.inequalities]
         return Polyhedron(equalities, inequalities)
 

+    def _asinequalities(self):
+        inequalities = list(self.equalities)
+        inequalities.extend([-expression for expression in self.equalities])
+        inequalities.extend(self.inequalities)
+        return inequalities
+
+    def widen(self, other):
+        if not isinstance(other, Polyhedron):
+            raise ValueError('argument must be a Polyhedron instance')
+        inequalities1 = self._asinequalities()
+        inequalities2 = other._asinequalities()
+        inequalities = []
+        for inequality1 in inequalities1:
+            if other <= Polyhedron(inequalities=[inequality1]):
+                inequalities.append(inequality1)
+        for inequality2 in inequalities2:
+            for i in range(len(inequalities1)):
+                inequalities3 = inequalities1[:i] + inequalities[i + 1:]
+                inequalities3.append(inequality2)
+                polyhedron3 = Polyhedron(inequalities=inequalities3)
+                if self == polyhedron3:
+                    inequalities.append(inequality2)
+                    break
+        return Polyhedron(inequalities=inequalities)
+

     @classmethod
     def _fromislbasicset(cls, islbset, symbols):
         islconstraints = islhelper.isl_basic_set_constraints(islbset)
     @classmethod
     def _fromislbasicset(cls, islbset, symbols):
         islconstraints = islhelper.isl_basic_set_constraints(islbset)


@@ -164,29 +239,39 @@ class Polyhedron(Domain):
         return domain
 
     def __repr__(self):
         return domain
 
     def __repr__(self):

-        if self.isempty():
-            return 'Empty'
-        elif self.isuniverse():
-            return 'Universe'
+        strings = []
+        for equality in self.equalities:
+            strings.append('Eq({}, 0)'.format(equality))
+        for inequality in self.inequalities:
+            strings.append('Ge({}, 0)'.format(inequality))
+        if len(strings) == 1:
+            return strings[0]

         else:
         else:

-            strings = []
-            for equality in self.equalities:
-                strings.append('0 == {}'.format(equality))
-            for inequality in self.inequalities:
-                strings.append('0 <= {}'.format(inequality))
-            if len(strings) == 1:
-                return strings[0]
-            else:
-                return 'And({})'.format(', '.join(strings))
+            return 'And({})'.format(', '.join(strings))
+
+
+    def _repr_latex_(self):
+        strings = []
+        for equality in self.equalities:
+            strings.append('{} = 0'.format(equality._repr_latex_().strip('$')))
+        for inequality in self.inequalities:
+            strings.append('{} \\ge 0'.format(inequality._repr_latex_().strip('$')))
+        return '$${}$$'.format(' \\wedge '.join(strings))

 
     @classmethod
     def fromsympy(cls, expr):
 
     @classmethod
     def fromsympy(cls, expr):

+        """
+        Convert a sympy object to an expression.
+        """

         domain = Domain.fromsympy(expr)
         if not isinstance(domain, Polyhedron):
             raise ValueError('non-polyhedral expression: {!r}'.format(expr))
         return domain
 
     def tosympy(self):
         domain = Domain.fromsympy(expr)
         if not isinstance(domain, Polyhedron):
             raise ValueError('non-polyhedral expression: {!r}'.format(expr))
         return domain
 
     def tosympy(self):

+        """
+        Return an expression as a sympy object.
+        """

         import sympy
         constraints = []
         for equality in self.equalities:
         import sympy
         constraints = []
         for equality in self.equalities:


@@ -196,47 +281,111 @@ class Polyhedron(Domain):
         return sympy.And(*constraints)
 
 
         return sympy.And(*constraints)
 
 

+class EmptyType(Polyhedron):
+
+    __slots__ = Polyhedron.__slots__
+
+    def __new__(cls):
+        self = object().__new__(cls)
+        self._equalities = (Rational(1),)
+        self._inequalities = ()
+        self._constraints = self._equalities
+        self._symbols = ()
+        self._dimension = 0
+        return self
+
+    def widen(self, other):
+        if not isinstance(other, Polyhedron):
+            raise ValueError('argument must be a Polyhedron instance')
+        return other
+
+    def __repr__(self):
+        return 'Empty'
+
+    def _repr_latex_(self):
+        return '$$\\emptyset$$'
+
+Empty = EmptyType()
+
+
+class UniverseType(Polyhedron):
+
+    __slots__ = Polyhedron.__slots__
+
+    def __new__(cls):
+        self = object().__new__(cls)
+        self._equalities = ()
+        self._inequalities = ()
+        self._constraints = ()
+        self._symbols = ()
+        self._dimension = ()
+        return self
+
+    def __repr__(self):
+        return 'Universe'
+
+    def _repr_latex_(self):
+        return '$$\\Omega$$'
+
+Universe = UniverseType()
+
+

 def _polymorphic(func):
     @functools.wraps(func)
     def wrapper(left, right):
 def _polymorphic(func):
     @functools.wraps(func)
     def wrapper(left, right):

-        if isinstance(left, numbers.Rational):
-            left = Rational(left)
-        elif not isinstance(left, Expression):
-            raise TypeError('left must be a a rational number '
-                'or a linear expression')
-        if isinstance(right, numbers.Rational):
-            right = Rational(right)
-        elif not isinstance(right, Expression):
-            raise TypeError('right must be a a rational number '
-                'or a linear expression')
+        if not isinstance(left, Expression):
+            if isinstance(left, numbers.Rational):
+                left = Rational(left)
+            else:
+                raise TypeError('left must be a a rational number '
+                    'or a linear expression')
+        if not isinstance(right, Expression):
+            if isinstance(right, numbers.Rational):
+                right = Rational(right)
+            else:
+                raise TypeError('right must be a a rational number '
+                    'or a linear expression')

         return func(left, right)
     return wrapper
 
 @_polymorphic
 def Lt(left, right):
         return func(left, right)
     return wrapper
 
 @_polymorphic
 def Lt(left, right):

+    """
+    Assert first set is less than the second set.
+    """

     return Polyhedron([], [right - left - 1])
 
 @_polymorphic
 def Le(left, right):
     return Polyhedron([], [right - left - 1])
 
 @_polymorphic
 def Le(left, right):

+    """
+    Assert first set is less than or equal to the second set.
+    """

     return Polyhedron([], [right - left])
 
 @_polymorphic
 def Eq(left, right):
     return Polyhedron([], [right - left])
 
 @_polymorphic
 def Eq(left, right):

+    """
+    Assert first set is equal to the second set.
+    """

     return Polyhedron([left - right], [])
 
 @_polymorphic
 def Ne(left, right):
     return Polyhedron([left - right], [])
 
 @_polymorphic
 def Ne(left, right):

+    """
+    Assert first set is not equal to the second set.
+    """

     return ~Eq(left, right)
 
 @_polymorphic
 def Gt(left, right):
     return ~Eq(left, right)
 
 @_polymorphic
 def Gt(left, right):

+    """
+    Assert first set is greater than the second set.
+    """

     return Polyhedron([], [left - right - 1])
 
 @_polymorphic
 def Ge(left, right):
     return Polyhedron([], [left - right - 1])
 
 @_polymorphic
 def Ge(left, right):

+    """
+    Assert first set is greater than or equal to the second set.
+    """

     return Polyhedron([], [left - right])
     return Polyhedron([], [left - right])

-
-
-Empty = Eq(1, 0)
-
-Universe = Polyhedron([])