Minor changes in plot functions

[linpy.git] / pypol / polyhedra.py

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index e745d7d..f8d413e 100644 (file)
--- a/pypol/polyhedra.py
+++ b/pypol/polyhedra.py
@@ -5,8 +5,8 @@ import numbers
 from . import islhelper
 
 from .islhelper import mainctx, libisl
 from . import islhelper
 
 from .islhelper import mainctx, libisl

-from .geometry import GeometricObject, Point, Vector
-from .linexprs import Expression, Symbol, Rational
+from .geometry import GeometricObject, Point
+from .linexprs import Expression, Rational

 from .domains import Domain
 
 
 from .domains import Domain
 
 


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

+        """
+        Return this set as disjoint.
+        """

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

+        """
+        Return true if this 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))


@@ -81,6 +87,9 @@ class Polyhedron(Domain):
         return universe
 
     def aspolyhedron(self):
         return universe
 
     def aspolyhedron(self):

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

         return self
 
     def __contains__(self, point):
         return self
 
     def __contains__(self, point):


@@ -105,6 +114,10 @@ class Polyhedron(Domain):
 
     @classmethod
     def _fromislbasicset(cls, islbset, symbols):
 
     @classmethod
     def _fromislbasicset(cls, islbset, symbols):

+        if libisl.isl_basic_set_is_empty(islbset):
+            return Empty
+        if libisl.isl_basic_set_is_universe(islbset):
+            return Universe

         islconstraints = islhelper.isl_basic_set_constraints(islbset)
         equalities = []
         inequalities = []
         islconstraints = islhelper.isl_basic_set_constraints(islbset)
         equalities = []
         inequalities = []


@@ -175,20 +188,23 @@ 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):


@@ -206,106 +222,49 @@ class Polyhedron(Domain):
             constraints.append(sympy.Ge(inequality.tosympy(), 0))
         return sympy.And(*constraints)
 
             constraints.append(sympy.Ge(inequality.tosympy(), 0))
         return sympy.And(*constraints)
 

-    @classmethod
-    def _polygon_inner_point(cls, points):
-        symbols = points[0].symbols
-        coordinates = {symbol: 0 for symbol in symbols}
-        for point in points:
-            for symbol, coordinate in point.coordinates():
-                coordinates[symbol] += coordinate
-        for symbol in symbols:
-            coordinates[symbol] /= len(points)
-        return Point(coordinates)

 
 

-    @classmethod
-    def _sort_polygon_2d(cls, points):
-        if len(points) <= 3:
-            return points
-        o = cls._polygon_inner_point(points)
-        angles = {}
-        for m in points:
-            om = Vector(o, m)
-            dx, dy = (coordinate for symbol, coordinate in om.coordinates())
-            angle = math.atan2(dy, dx)
-            angles[m] = angle
-        return sorted(points, key=angles.get)
+class EmptyType(Polyhedron):

 
 

-    @classmethod
-    def _sort_polygon_3d(cls, points):
-        if len(points) <= 3:
-            return points
-        o = cls._polygon_inner_point(points)
-        a = points[0]
-        oa = Vector(o, a)
-        norm_oa = oa.norm()
-        for b in points[1:]:
-            ob = Vector(o, b)
-            u = oa.cross(ob)
-            if not u.isnull():
-                u = u.asunit()
-                break
-        else:
-            raise ValueError('degenerate polygon')
-        angles = {a: 0.}
-        for m in points[1:]:
-            om = Vector(o, m)
-            normprod = norm_oa * om.norm()
-            cosinus = oa.dot(om) / normprod
-            sinus = u.dot(oa.cross(om)) / normprod
-            angle = math.acos(cosinus)
-            angle = math.copysign(angle, sinus)
-            angles[m] = angle
-        return sorted(points, key=angles.get)
-
-    def faces(self):
-        vertices = self.vertices()
-        faces = []
-        for constraint in self.constraints:
-            face = []
-            for vertex in vertices:
-                if constraint.subs(vertex.coordinates()) == 0:
-                    face.append(vertex)
-            faces.append(face)
-        return faces
-
-    def plot(self):
-        import matplotlib.pyplot as plt
-        from matplotlib.path import Path
-        import matplotlib.patches as patches
-
-        if len(self.symbols)> 3:
-            raise TypeError
-
-        elif len(self.symbols) == 2:
-            verts = self.vertices()
-            points = []
-            codes = [Path.MOVETO]
-            for vert in verts:
-                pairs = ()
-                for sym in sorted(vert, key=Symbol.sortkey):
-                    num = vert.get(sym)
-                    pairs = pairs + (num,)
-                points.append(pairs)
-            points.append((0.0, 0.0))
-            num = len(points)
-            while num > 2:
-                codes.append(Path.LINETO)
-                num = num - 1
-            else:
-                codes.append(Path.CLOSEPOLY)
-            path = Path(points, codes)
-            fig = plt.figure()
-            ax = fig.add_subplot(111)
-            patch = patches.PathPatch(path, facecolor='blue', lw=2)
-            ax.add_patch(patch)
-            ax.set_xlim(-5,5)
-            ax.set_ylim(-5,5)
-            plt.show()
+    __slots__ = Polyhedron.__slots__

 
 

-        elif len(self.symbols)==3:
-            return 0
+    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 __repr__(self):
+        return 'Empty'

 
 

-        return points
+    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):
 
 
 def _polymorphic(func):


@@ -328,29 +287,42 @@ def _polymorphic(func):
 
 @_polymorphic
 def Lt(left, right):
 
 @_polymorphic
 def Lt(left, right):

+    """
+    Return true if the first set is less than the second.
+    """

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

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

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

+    """
+    Return true if the sets are equal.
+    """

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

+    """
+    Return true if the sets are NOT equal.
+    """

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

+    """
+    Return true if the 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):

+    """
+    Return true if the first set is greater than or equal the second set.
+    """

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

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