Check for SymPy presence in unittary tests

[linpy.git] / pypol / linear.py

diff --git a/pypol/linear.py b/pypol/linear.py
index e6d442e..b69836d 100644 (file)
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -5,8 +5,8 @@ import re
 
 from fractions import Fraction, gcd
 
 
 from fractions import Fraction, gcd
 

-from pypol import isl
-from pypol.isl import libisl
+from . import isl
+from .isl import libisl

 
 
 __all__ = [
 
 
 __all__ = [


@@ -329,6 +329,31 @@ class Expression:
     def __gt__(self, other):
         return Polyhedron(inequalities=[(self - other)._toint() - 1])
 
     def __gt__(self, other):
         return Polyhedron(inequalities=[(self - other)._toint() - 1])
 

+    @classmethod
+    def fromsympy(cls, expr):
+        import sympy
+        coefficients = {}
+        constant = 0
+        for symbol, coefficient in expr.as_coefficients_dict().items():
+            coefficient = Fraction(coefficient.p, coefficient.q)
+            if symbol == sympy.S.One:
+                constant = coefficient
+            elif isinstance(symbol, sympy.Symbol):
+                symbol = symbol.name
+                coefficients[symbol] = coefficient
+            else:
+                raise ValueError('non-linear expression: {!r}'.format(expr))
+        return cls(coefficients, constant)
+
+    def tosympy(self):
+        import sympy
+        expr = 0
+        for symbol, coefficient in self.coefficients():
+            term = coefficient * sympy.Symbol(symbol)
+            expr += term
+        expr += self.constant
+        return expr
+

 
 class Constant(Expression):
 
 
 class Constant(Expression):
 


@@ -361,6 +386,17 @@ class Constant(Expression):
             return '{}({!r}, {!r})'.format(self.__class__.__name__,
                 self.constant.numerator, self.constant.denominator)
 
             return '{}({!r}, {!r})'.format(self.__class__.__name__,
                 self.constant.numerator, self.constant.denominator)
 

+    @classmethod
+    def fromsympy(cls, expr):
+        import sympy
+        if isinstance(expr, sympy.Rational):
+            return cls(expr.p, expr.q)
+        elif isinstance(expr, numbers.Rational):
+            return cls(expr)
+        else:
+            raise TypeError('expr must be a sympy.Rational instance')
+
+

 class Symbol(Expression):
 
     __slots__ = Expression.__slots__ + (
 class Symbol(Expression):
 
     __slots__ = Expression.__slots__ + (


@@ -390,6 +426,15 @@ class Symbol(Expression):
     def __repr__(self):
         return '{}({!r})'.format(self.__class__.__name__, self._name)
 
     def __repr__(self):
         return '{}({!r})'.format(self.__class__.__name__, self._name)
 

+    @classmethod
+    def fromsympy(cls, expr):
+        import sympy
+        if isinstance(expr, sympy.Symbol):
+            return cls(expr.name)
+        else:
+            raise TypeError('expr must be a sympy.Symbol instance')
+
+

 def symbols(names):
     if isinstance(names, str):
         names = names.replace(',', ' ').split()
 def symbols(names):
     if isinstance(names, str):
         names = names.replace(',', ' ').split()


@@ -699,7 +744,8 @@ Universe = Polyhedron()
 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

-    p1 = Polyhedron('2a + 2b + 1 == 0') # empty
-    print(p1._toisl())
-    p2 = Polyhedron('3x + 2y + 3 == 0') # not empty
-    print(p2._toisl())
+    #p = Polyhedron('2a + 2b + 1 == 0') # empty
+    p = Polyhedron('3x + 2y + 3 == 0, y == 0') # not empty
+    ip = p._toisl()
+    print(ip)
+    print(ip.constraints())