Swap order of symbols and Dummy

diff --git a/pypol/__init__.py b/pypol/__init__.py
index c81cb2539efaf301884fc10511534b8b4fc45e63..e39bce7bb3b1e50435a0c223f3ef382bbf7408c8 100644 (file)
--- a/pypol/__init__.py
+++ b/pypol/__init__.py
@@ -2,13 +2,13 @@
 A polyhedral library based on ISL.
 """
 
 A polyhedral library based on ISL.
 """
 

-from .linexprs import Expression, Symbol, symbols, Dummy, Rational
+from .linexprs import Expression, Symbol, Dummy, symbols, Rational

 from .polyhedra import Polyhedron, Eq, Ne, Le, Lt, Ge, Gt, Ne, Empty, Universe
 from .domains import Domain, And, Or, Not
 
 
 __all__ = [
 from .polyhedra import Polyhedron, Eq, Ne, Le, Lt, Ge, Gt, Ne, Empty, Universe
 from .domains import Domain, And, Or, Not
 
 
 __all__ = [

-    'Expression', 'Symbol', 'symbols', 'Dummy', 'Rational',
+    'Expression', 'Symbol', 'Dummy', 'symbols', 'Rational',

     'Polyhedron', 'Eq', 'Ne', 'Le', 'Lt', 'Ge', 'Gt', 'Empty', 'Universe',
     'Domain', 'And', 'Or', 'Not',
 ]
     'Polyhedron', 'Eq', 'Ne', 'Le', 'Lt', 'Ge', 'Gt', 'Empty', 'Universe',
     'Domain', 'And', 'Or', 'Not',
 ]

diff --git a/pypol/linexprs.py b/pypol/linexprs.py
index f3cff2344cb08977fd5fbc5a02d4cc2bde5e958c..ef5d90b0dba68c44b5683250ca5043671a23ce81 100644 (file)
--- a/pypol/linexprs.py
+++ b/pypol/linexprs.py
@@ -9,7 +9,7 @@ from fractions import Fraction, gcd
 
 __all__ = [
     'Expression',
 
 __all__ = [
     'Expression',

-    'Symbol', 'symbols', 'Dummy',
+    'Symbol', 'Dummy', 'symbols',

     'Rational',
 ]
 
     'Rational',
 ]
 


@@ -415,12 +415,6 @@ class Symbol(Expression):
             raise TypeError('expr must be a sympy.Symbol instance')
 
 
             raise TypeError('expr must be a sympy.Symbol instance')
 
 

-def symbols(names):
-    if isinstance(names, str):
-        names = names.replace(',', ' ').split()
-    return tuple(Symbol(name) for name in names)
-
-

 class Dummy(Symbol):
 
     __slots__ = (
 class Dummy(Symbol):
 
     __slots__ = (


@@ -449,6 +443,12 @@ class Dummy(Symbol):
         return isinstance(other, Dummy) and self._index == other._index
 
 
         return isinstance(other, Dummy) and self._index == other._index
 
 

+def symbols(names):
+    if isinstance(names, str):
+        names = names.replace(',', ' ').split()
+    return tuple(Symbol(name) for name in names)
+
+

 class Rational(Expression):
 
     __slots__ = (
 class Rational(Expression):
 
     __slots__ = (

diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py
index 508c57b88ff43ef5f537393f1bccabf8891a003f..4c27b2139e28c0f66a0a7da503088e93fa0c2cd5 100644 (file)
--- a/pypol/tests/test_linexprs.py
+++ b/pypol/tests/test_linexprs.py
@@ -225,11 +225,6 @@ class TestSymbol(unittest.TestCase):
         with self.assertRaises(TypeError):
             Symbol.fromsympy(sp_x*sp_x)
 
         with self.assertRaises(TypeError):
             Symbol.fromsympy(sp_x*sp_x)
 

-    def test_symbols(self):
-        self.assertListEqual(list(symbols('x y')), [self.x, self.y])
-        self.assertListEqual(list(symbols('x,y')), [self.x, self.y])
-        self.assertListEqual(list(symbols(['x', 'y'])), [self.x, self.y])
-

 
 class TestDummy(unittest.TestCase):
 
 
 class TestDummy(unittest.TestCase):
 


@@ -248,6 +243,22 @@ class TestDummy(unittest.TestCase):
         self.assertNotEqual(Dummy(), Dummy())
 
 
         self.assertNotEqual(Dummy(), Dummy())
 
 

+class TestSymbols(unittest.TestCase):
+
+    def setUp(self):
+        self.x = Symbol('x')
+        self.y = Symbol('y')
+
+    def test(self):
+        self.assertListEqual(list(symbols('x y')), [self.x, self.y])
+        self.assertListEqual(list(symbols('x,y')), [self.x, self.y])
+        self.assertListEqual(list(symbols(['x', 'y'])), [self.x, self.y])
+        with self.assertRaises(TypeError):
+            symbols(1)
+        with self.assertRaises(TypeError):
+            symbols(['a', 1])
+
+

 class TestRational(unittest.TestCase):
 
     def setUp(self):
 class TestRational(unittest.TestCase):
 
     def setUp(self):