Make coordinates mandatory in Point constructor

[linpy.git] / pypol / polyhedra.py

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index db99753..a08213d 100644 (file)
--- a/pypol/polyhedra.py
+++ b/pypol/polyhedra.py
@@ -1,10 +1,12 @@
 
 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 .coordinates import Point

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


@@ -86,6 +88,19 @@ class Polyhedron(Domain):
     def aspolyhedron(self):
         return self
 
     def aspolyhedron(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):
         equalities = [equality.subs(symbol, expression)
             for equality in self.equalities]
     def subs(self, symbol, expression=None):
         equalities = [equality.subs(symbol, expression)
             for equality in self.equalities]


@@ -195,19 +210,55 @@ class Polyhedron(Domain):
         for inequality in self.inequalities:
             constraints.append(sympy.Ge(inequality.tosympy(), 0))
         return sympy.And(*constraints)
         for inequality in self.inequalities:
             constraints.append(sympy.Ge(inequality.tosympy(), 0))
         return sympy.And(*constraints)

-    
+
+    @classmethod
+    def _sort_polygon_2d(cls, points):
+        if len(points) <= 3:
+            return points
+        o = sum((Vector(point) for point in points)) / len(points)
+        o = Point(o.coordinates())
+        angles = {}
+        for m in points:
+            om = Vector(o, m)
+            dx, dy = (coordinate for symbol, coordinates in om.coordinates())
+            angle = math.atan2(dy, dx)
+            angles[m] = angle
+        return sorted(points, key=angles.get)
+
+    @classmethod
+    def _sort_polygon_3d(cls, points):
+        if len(points) <= 3:
+            return points
+        o = sum((Vector(point) for point in points)) / len(points)
+        o = Point(o.coordinates())
+        a, b = points[:2]
+        oa = Vector(o, a)
+        ob = Vector(o, b)
+        norm_oa = oa.norm()
+        u = (oa.cross(ob)).asunit()
+        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 plot(self):
         import matplotlib.pyplot as plt
         from matplotlib.path import Path
         import matplotlib.patches as patches
     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
         if len(self.symbols)> 3:
             raise TypeError

-        
+

         elif len(self.symbols) == 2:
             verts = self.vertices()
             points = []
         elif len(self.symbols) == 2:
             verts = self.vertices()
             points = []

-            codes = [Path.MOVETO]   
+            codes = [Path.MOVETO]

             for vert in verts:
                 pairs = ()
                 for sym in sorted(vert, key=Symbol.sortkey):
             for vert in verts:
                 pairs = ()
                 for sym in sorted(vert, key=Symbol.sortkey):


@@ -229,10 +280,10 @@ class Polyhedron(Domain):
             ax.set_xlim(-5,5)
             ax.set_ylim(-5,5)
             plt.show()
             ax.set_xlim(-5,5)
             ax.set_ylim(-5,5)
             plt.show()

-            
+

         elif len(self.symbols)==3:
             return 0
         elif len(self.symbols)==3:
             return 0

-            
+

         return points
 
 
         return points