New example: basic implementation of ACI'10

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 6b47fe8..6060dc9 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -5,7 +5,7 @@ import re
 from . import islhelper
 
 from .islhelper import mainctx, libisl, isl_set_basic_sets
 from . import islhelper
 
 from .islhelper import mainctx, libisl, isl_set_basic_sets

-from .linexprs import Expression, Symbol
+from .linexprs import Expression, Symbol, symbolnames

 
 
 __all__ = [
 
 
 __all__ = [


@@ -154,15 +154,7 @@ class Domain:
 
     def project_out(self, symbols):
         # use to remove certain variables
 
     def project_out(self, symbols):
         # use to remove certain variables

-        if isinstance(symbols, str):
-            symbols = symbols.replace(',', ' ').split()
-        else:
-            symbols = list(symbols)
-            for i, symbol in enumerate(symbols):
-                if isinstance(symbol, Symbol):
-                    symbols[i] = symbol.name
-                elif not isinstance(symbol, str):
-                    raise TypeError('symbols must be strings or Symbol instances')
+        symbols = symbolnames(symbols)

         islset = self._toislset(self.polyhedra, self.symbols)
         # the trick is to walk symbols in reverse order, to avoid index updates
         for index, symbol in reversed(list(enumerate(self.symbols))):
         islset = self._toislset(self.polyhedra, self.symbols)
         # the trick is to walk symbols in reverse order, to avoid index updates
         for index, symbol in reversed(list(enumerate(self.symbols))):


@@ -249,6 +241,7 @@ class Domain:
             self._dimension = len(self._symbols)
             return self
 
             self._dimension = len(self._symbols)
             return self
 

+    @classmethod

     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,
     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,


@@ -345,6 +338,7 @@ class Domain:
     def tosympy(self):
         raise NotImplementedError
 
     def tosympy(self):
         raise NotImplementedError
 

+

 def And(*domains):
     if len(domains) == 0:
         from .polyhedra import Universe
 def And(*domains):
     if len(domains) == 0:
         from .polyhedra import Universe