Make Expression.subs() always return a LinExpr instance

[linpy.git] / linpy / polyhedra.py

diff --git a/linpy/polyhedra.py b/linpy/polyhedra.py
index c05432a..ead9b83 100644 (file)
--- a/linpy/polyhedra.py
+++ b/linpy/polyhedra.py
@@ -94,15 +94,23 @@ class Polyhedron(Domain):
         sc_equalities = []
         if equalities is not None:
             for equality in equalities:
         sc_equalities = []
         if equalities is not None:
             for equality in equalities:

-                if not isinstance(equality, LinExpr):
-                    raise TypeError('equalities must be linear expressions')
-                sc_equalities.append(equality.scaleint())
+                if isinstance(equality, LinExpr):
+                    sc_equalities.append(equality.scaleint())
+                elif isinstance(equality, numbers.Rational):
+                    sc_equalities.append(Rational(equality).scaleint())
+                else:
+                    raise TypeError('equalities must be linear expressions '
+                        'or rational numbers')

         sc_inequalities = []
         if inequalities is not None:
             for inequality in inequalities:
         sc_inequalities = []
         if inequalities is not None:
             for inequality in inequalities:

-                if not isinstance(inequality, LinExpr):
-                    raise TypeError('inequalities must be linear expressions')
-                sc_inequalities.append(inequality.scaleint())
+                if isinstance(inequality, LinExpr):
+                    sc_inequalities.append(inequality.scaleint())
+                elif isinstance(inequality, numbers.Rational):
+                    sc_inequalities.append(Rational(inequality).scaleint())
+                else:
+                    raise TypeError('inequalities must be linear expressions '
+                        'or rational numbers')

         symbols = cls._xsymbols(sc_equalities + sc_inequalities)
         islbset = cls._toislbasicset(sc_equalities, sc_inequalities, symbols)
         return cls._fromislbasicset(islbset, symbols)
         symbols = cls._xsymbols(sc_equalities + sc_inequalities)
         islbset = cls._toislbasicset(sc_equalities, sc_inequalities, symbols)
         return cls._fromislbasicset(islbset, symbols)


@@ -318,10 +326,10 @@ class Polyhedron(Domain):
             return 'And({})'.format(', '.join(strings))
 
     @classmethod
             return 'And({})'.format(', '.join(strings))
 
     @classmethod

-    def fromsympy(cls, expr):
-        domain = Domain.fromsympy(expr)
+    def fromsympy(cls, expression):
+        domain = Domain.fromsympy(expression)

         if not isinstance(domain, Polyhedron):
         if not isinstance(domain, Polyhedron):

-            raise ValueError('non-polyhedral expression: {!r}'.format(expr))
+            raise ValueError('non-polyhedral expression: {!r}'.format(expression))

         return domain
 
     def tosympy(self):
         return domain
 
     def tosympy(self):


@@ -380,75 +388,75 @@ Universe = UniverseType()
 
 def _pseudoconstructor(func):
     @functools.wraps(func)
 
 def _pseudoconstructor(func):
     @functools.wraps(func)

-    def wrapper(expr1, expr2, *exprs):
-        exprs = (expr1, expr2) + exprs
-        for expr in exprs:
-            if not isinstance(expr, LinExpr):
-                if isinstance(expr, numbers.Rational):
-                    expr = Rational(expr)
+    def wrapper(expression1, expression2, *expressions):
+        expressions = (expression1, expression2) + expressions
+        for expression in expressions:
+            if not isinstance(expression, LinExpr):
+                if isinstance(expression, numbers.Rational):
+                    expression = Rational(expression)

                 else:
                     raise TypeError('arguments must be rational numbers '
                         'or linear expressions')
                 else:
                     raise TypeError('arguments must be rational numbers '
                         'or linear expressions')

-        return func(*exprs)
+        return func(*expressions)

     return wrapper
 
 @_pseudoconstructor
     return wrapper
 
 @_pseudoconstructor

-def Lt(*exprs):
+def Lt(*expressions):

     """
     Create the polyhedron with constraints expr1 < expr2 < expr3 ...
     """
     inequalities = []
     """
     Create the polyhedron with constraints expr1 < expr2 < expr3 ...
     """
     inequalities = []

-    for left, right in zip(exprs, exprs[1:]):
+    for left, right in zip(expressions, expressions[1:]):

         inequalities.append(right - left - 1)
     return Polyhedron([], inequalities)
 
 @_pseudoconstructor
         inequalities.append(right - left - 1)
     return Polyhedron([], inequalities)
 
 @_pseudoconstructor

-def Le(*exprs):
+def Le(*expressions):

     """
     Create the polyhedron with constraints expr1 <= expr2 <= expr3 ...
     """
     inequalities = []
     """
     Create the polyhedron with constraints expr1 <= expr2 <= expr3 ...
     """
     inequalities = []

-    for left, right in zip(exprs, exprs[1:]):
+    for left, right in zip(expressions, expressions[1:]):

         inequalities.append(right - left)
     return Polyhedron([], inequalities)
 
 @_pseudoconstructor
         inequalities.append(right - left)
     return Polyhedron([], inequalities)
 
 @_pseudoconstructor

-def Eq(*exprs):
+def Eq(*expressions):

     """
     Create the polyhedron with constraints expr1 == expr2 == expr3 ...
     """
     equalities = []
     """
     Create the polyhedron with constraints expr1 == expr2 == expr3 ...
     """
     equalities = []

-    for left, right in zip(exprs, exprs[1:]):
+    for left, right in zip(expressions, expressions[1:]):

         equalities.append(left - right)
     return Polyhedron(equalities, [])
 
 @_pseudoconstructor
         equalities.append(left - right)
     return Polyhedron(equalities, [])
 
 @_pseudoconstructor

-def Ne(*exprs):
+def Ne(*expressions):

     """
     Create the domain such that expr1 != expr2 != expr3 ... The result is a
     Domain object, not a Polyhedron.
     """
     domain = Universe
     """
     Create the domain such that expr1 != expr2 != expr3 ... The result is a
     Domain object, not a Polyhedron.
     """
     domain = Universe

-    for left, right in zip(exprs, exprs[1:]):
+    for left, right in zip(expressions, expressions[1:]):

         domain &= ~Eq(left, right)
     return domain
 
 @_pseudoconstructor
         domain &= ~Eq(left, right)
     return domain
 
 @_pseudoconstructor

-def Ge(*exprs):
+def Ge(*expressions):

     """
     Create the polyhedron with constraints expr1 >= expr2 >= expr3 ...
     """
     inequalities = []
     """
     Create the polyhedron with constraints expr1 >= expr2 >= expr3 ...
     """
     inequalities = []

-    for left, right in zip(exprs, exprs[1:]):
+    for left, right in zip(expressions, expressions[1:]):

         inequalities.append(left - right)
     return Polyhedron([], inequalities)
 
 @_pseudoconstructor
         inequalities.append(left - right)
     return Polyhedron([], inequalities)
 
 @_pseudoconstructor

-def Gt(*exprs):
+def Gt(*expressions):

     """
     Create the polyhedron with constraints expr1 > expr2 > expr3 ...
     """
     inequalities = []
     """
     Create the polyhedron with constraints expr1 > expr2 > expr3 ...
     """
     inequalities = []

-    for left, right in zip(exprs, exprs[1:]):
+    for left, right in zip(expressions, expressions[1:]):

         inequalities.append(left - right - 1)
     return Polyhedron([], inequalities)
         inequalities.append(left - right - 1)
     return Polyhedron([], inequalities)