X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/0efaf62e3354a0663031bc16b53d9d8b597f50d0..49ee540c88ee9e40095635cf574e2966712d5101:/pypol/linear.py

diff --git a/pypol/linear.py b/pypol/linear.py
index 8a61744..5b2dc80 100644
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -50,6 +50,13 @@ class Expression:
     This class implements linear expressions.
     """
 
+    __slots__ = (
+        '_coefficients',
+        '_constant',
+        '_symbols',
+        '_dimension',
+    )
+
     def __new__(cls, coefficients=None, constant=0):
         if isinstance(coefficients, str):
             if constant:
@@ -117,9 +124,7 @@ class Expression:
 
     @classmethod
     def fromstring(cls, string):
-        string = re.sub(r'(\d+|\))\s*([^\W\d_]\w*|\()',
-                lambda m: '{}*{}'.format(m.group(1), m.group(2)),
-                string)
+        string = re.sub(r'(\d+|\))\s*([^\W\d_]\w*|\()', r'\1*\2', string)
         tree = ast.parse(string, 'eval')
         return cls._fromast(tree)
 
@@ -357,6 +362,10 @@ class Constant(Expression):
 
 class Symbol(Expression):
 
+    __slots__ = Expression.__slots__ + (
+        '_name',
+    )
+
     def __new__(cls, name):
         if isinstance(name, Symbol):
             name = name.name
@@ -412,6 +421,13 @@ class Polyhedron:
     This class implements polyhedrons.
     """
 
+    __slots__ = (
+        '_equalities',
+        '_inequalities',
+        '_constraints',
+        '_symbols',
+    )
+
     def __new__(cls, equalities=None, inequalities=None):
         if isinstance(equalities, str):
             if inequalities is not None:
@@ -445,7 +461,40 @@ class Polyhedron:
 
     @classmethod
     def fromstring(cls, string):
-        raise NotImplementedError
+        string = string.strip()
+        string = re.sub(r'^\{\s*|\s*\}$', '', string)
+        string = re.sub(r'([^<=>])=([^<=>])', r'\1==\2', string)
+        string = re.sub(r'(\d+|\))\s*([^\W\d_]\w*|\()', r'\1*\2', string)
+        equalities = []
+        inequalities = []
+        for cstr in re.split(r',|;|and|&&|/\\|∧', string, flags=re.I):
+            tree = ast.parse(cstr.strip(), 'eval')
+            if not isinstance(tree, ast.Module) or len(tree.body) != 1:
+                raise SyntaxError('invalid syntax')
+            node = tree.body[0]
+            if not isinstance(node, ast.Expr):
+                raise SyntaxError('invalid syntax')
+            node = node.value
+            if not isinstance(node, ast.Compare):
+                raise SyntaxError('invalid syntax')
+            left = Expression._fromast(node.left)
+            for i in range(len(node.ops)):
+                op = node.ops[i]
+                right = Expression._fromast(node.comparators[i])
+                if isinstance(op, ast.Lt):
+                    inequalities.append(right - left - 1)
+                elif isinstance(op, ast.LtE):
+                    inequalities.append(right - left)
+                elif isinstance(op, ast.Eq):
+                    equalities.append(left - right)
+                elif isinstance(op, ast.GtE):
+                    inequalities.append(left - right)
+                elif isinstance(op, ast.Gt):
+                    inequalities.append(left - right - 1)
+                else:
+                    raise SyntaxError('invalid syntax')
+                left = right
+        return cls(equalities, inequalities)
 
     @property
     def equalities(self):
@@ -612,7 +661,7 @@ class Polyhedron:
                 dim = symbols.index(symbol)
                 cin = libisl.isl_constraint_set_coefficient_val(cin, libisl.isl_dim_set, dim, val)
             if inequality.constant != 0:
-                val = str(ineq.constant).encode()
+                val = str(inequality.constant).encode()
                 val = libisl.isl_val_read_from_str(_main_ctx, val)
                 cin = libisl.isl_constraint_set_constant_val(cin, val)
             bset = libisl.isl_basic_set_add_constraint(bset, cin)
@@ -635,9 +684,7 @@ Empty = eq(0,1)
 Universe = Polyhedron()
 
 if __name__ == '__main__':
-    e1 = Expression('2a + 2b + 1')
-    p1 = Polyhedron(equalities=[e1]) # empty
-    e2 = Expression('3x + 2y + 3')
-    p2 = Polyhedron(equalities=[e2]) # not empty
+    p1 = Polyhedron('2a + 2b + 1 == 0') # empty
     print(p1._toisl())
+    p2 = Polyhedron('3x + 2y + 3 == 0') # not empty
     print(p2._toisl())