NotEq

ActivitySim · Mar 20, 2024 · d9c7fae · d9c7fae
1 parent d9e240f
commit d9c7fae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/sharrow/aster.py b/sharrow/aster.py
@@ -977,8 +977,8 @@ def visit_Call(self, node):
     def visit_Compare(self, node):
         result = None
 
-        # devolve XXX == YYY when XXX or YYY is a categorical and the other is a constant category value
-        if len(node.ops) == 1 and isinstance(node.ops[0], ast.Eq):
+        # devolve XXX ==/!= YYY when XXX or YYY is a categorical and the other is a constant category value
+        if len(node.ops) == 1 and isinstance(node.ops[0], (ast.Eq, ast.NotEq)):
             left = self.visit(node.left)
             right = self.visit(node.comparators[0])
             left_is_categorical = (

diff --git a/sharrow/tests/test_categorical.py b/sharrow/tests/test_categorical.py
@@ -170,3 +170,9 @@ def test_missing_categorical():
     a = f6.load_dataarray(dtype=np.int8)
     a = a.isel(expressions=0)
     assert all(a == np.asarray([0, 0, 0, 0, 0, 0]))
+
+    expr = "df.TourMode2 != 'Bus'"
+    f7 = tree.setup_flow({expr: expr}, with_root_node_name="df")
+    a = f7.load_dataarray(dtype=np.int8)
+    a = a.isel(expressions=0)
+    assert all(a == np.asarray([1, 0, 1, 1, 1, 1]))