Merge e160da4 into ffc5514

Crunch-io · Mar 4, 2019 · 801dc5d · 801dc5d
2 parents ffc5514 + e160da4
commit 801dc5d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/cr/cube/cube_slice.py b/src/cr/cube/cube_slice.py
@@ -119,7 +119,7 @@ def can_compare_pairwise(self):
         if self.ndim != 2:
             return False
 
-        return all(dt in (DT.CAT, DT.CA_CAT) for dt in self.dim_types)
+        return all(dt in DT.ALLOWED_PAIRWISE_TYPES for dt in self.dim_types)
 
     @lazyproperty
     def dim_types(self):

diff --git a/src/cr/cube/enum.py b/src/cr/cube/enum.py
@@ -48,3 +48,6 @@ class DIMENSION_TYPE(object):
 
     # ---subsets---
     ARRAY_TYPES = frozenset((CA_SUBVAR, MR_SUBVAR))
+
+    # ---allowed types for pairwise comparison---
+    ALLOWED_PAIRWISE_TYPES = frozenset((CAT, CA_CAT, BINNED_NUMERIC, DATETIME, TEXT))
diff --git a/tests/unit/test_cube_slice.py b/tests/unit/test_cube_slice.py
@@ -98,13 +98,16 @@ def it_can_compare_pairwise(
             ((DT.CA_SUBVAR, DT.CA_CAT), False),
             ((DT.CA_SUBVAR, DT.MR, DT.CA_CAT), False),
             ((DT.MR, DT.CAT), False),
-            ((DT.BINNED_NUMERIC, DT.CAT), False),
-            ((DT.DATETIME, DT.CAT), False),
             ((DT.LOGICAL, DT.CAT), False),
-            ((DT.TEXT, DT.CAT), False),
             ((DT.CA_CAT, DT.CAT), True),
             ((DT.CAT, DT.CA_CAT), True),
             ((DT.CAT, DT.CAT), True),
+            ((DT.BINNED_NUMERIC, DT.CAT), True),
+            ((DT.CAT, DT.BINNED_NUMERIC), True),
+            ((DT.DATETIME, DT.CAT), True),
+            ((DT.CAT, DT.DATETIME), True),
+            ((DT.CAT, DT.TEXT), True),
+            ((DT.TEXT, DT.CAT), True),
         ]
     )
     def pairwise_comparisons_fixture(self, request):