-

cool-RR · cool-RR · commit 42dc1a367958 · 2014-09-27T04:51:56.000+03:00
diff --git a/=1.0 b/=1.0
diff --git a/setup.py b/setup.py
@@ -148,7 +148,8 @@ def get_packages():
 
 install_requires = ['setuptools']
 if sys.version_info[:2] <= (3, 3):
-    install_requires.append('pathlib>=0.97')
+    install_requires.append('pathlib,>=1.0.1,<2')
+    install_requires.append('enum34>=1.0,<2')
     
 
 setuptools.setup(
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -8,6 +8,7 @@
 import sys
 import math
 import numbers
+import enum
 
 from python_toolbox import misc_tools
 from python_toolbox import nifty_collections
@@ -23,19 +24,14 @@
 from python_toolbox import misc_tools
 
 from . import misc
+from . import variations
 from ._variation_removing_mixin import _VariationRemovingMixin
 from ._variation_adding_mixin import _VariationAddingMixin
 from ._fixed_map_managing_mixin import _FixedMapManagingMixin
 
 infinity = float('inf')
 
 
-class UnsupportedVariationCombinationException(Exception):
-    '''blocktodo use everywhere
-    let it take variations
-    make variation classes mostly for this and testing'''
-        
-
 class PermSpaceType(abc.ABCMeta):
     '''
     Metaclass for `PermSpace` and `CombSpace`.
diff --git a/source_py3/python_toolbox/combi/variations.py b/source_py3/python_toolbox/combi/variations.py
@@ -0,0 +1,43 @@
+import enum
+
+from python_toolbox import cute_iter_tools
+from python_toolbox import caching
+
+from .selection_space import SelectionSpace
+
+
+class UnsupportedVariationCombinationException(Exception):
+    '''blocktodo use everywhere
+    let it take variations
+    make variation classes mostly for this and testing'''
+    
+
+class PermSpaceVariation(enum.Enum):
+    RAPPLIED = 'rapplied'
+    RECURRENT = 'recurrent'
+    PARTIAL = 'partial'
+    COMBINATION = 'combination'
+    DAPPLIED = 'dapplied'
+    FIXED = 'fixed'
+    DEGREED = 'degreed'
+    SLICED = 'sliced'
+
+
+variation_clashes = (
+    {PermSpaceVariation.DEGREED, PermSpaceVariation.COMBINATION},
+    {PermSpaceVariation.DEGREED, PermSpaceVariation.PARTIAL},
+    {PermSpaceVariation.DEGREED, PermSpaceVariation.RECURRENT},
+    {PermSpaceVariation.COMBINATION, PermSpaceVariation.FIXED},
+)
+
+
+allowed_variation_combinations, unallowed_variation_combinations = \
+                                                 cute_iter_tools.double_filter(
+    lambda variation_combination: any(
+                variation_clash <= variation_combination for variation_clash in
+                                                            variation_clashes),
+    SelectionSpace(PermSpaceVariation),
+    lazy_tuple=True
+)
+
+
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -235,7 +235,7 @@ def double_filter(filter_function, iterable, lazy_tuple=False):
     Note that this function is not thread-safe. (You may not consume the two
     iterators on two separate threads.)
     
-    If `lazy_tuple=True`, returns a `LazyTuple` rather than an iterator.
+    If `lazy_tuple=True`, returns two `LazyTuple` objects rather than two iterator.
     '''
     iterator = iter(iterable)
     
diff --git a/source_py3/test_python_toolbox/test_combi/test_amazing.py b/source_py3/test_python_toolbox/test_combi/test_amazing.py
@@ -0,0 +1,20 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+import pickle
+import itertools
+
+from python_toolbox import sequence_tools
+
+from python_toolbox import combi
+from python_toolbox.combi import *
+
+infinity = float('inf')
+infinities = (infinity, -infinity)
+
+
+def test_perm_spaces():
+    pure_0a = PermSpace(4)
+    pure_0b = PermSpace(range(4))
+    pure_0c = PermSpace(list(range(4)))
+    pure_0d = PermSpace(iter(range(4)))
