Added criteria for checking if expression contains a specific free symbol, constant or number

Author: KarlLundengaard

app/context/symbolic.py

@@ -35,8 +35,10 @@ def check_criterion(criterion, parameters_dict, generate_feedback=True):
     parsing_params.update({"simplify": False})
     if label in {"EQUALITY", "WRITTEN_AS"}:
         result = check_equality(criterion, parameters_dict)
-    if label == "ORDER":
+    elif label == "ORDER":
         result = check_order(criterion, parameters_dict)
+    elif label == "CONTAINS":
+        result = check_contains_symbol(criterion, parameters_dict)
     elif label == "WHERE":
         crit = criterion.children[0]
         subs = criterion.children[1]
@@ -143,6 +145,12 @@ def check_order(criterion, parameters_dict, local_substitutions=[]):
     return result
 
 
+def check_contains_symbol(criterion, parameters_dict, local_substitutions=[]):
+    lhs_expr, rhs_expr = create_expressions_for_comparison(criterion, parameters_dict, local_substitutions)
+    result = rhs_expr in lhs_expr.atoms()
+    return result
+
+
 def find_coords_for_node_type(expression, node_type):
     stack = [(expression, tuple())]
     node_coords = []

app/tests/symbolic_evaluation_tests.py

@@ -1795,6 +1795,7 @@ def test_criteria_where_numerical_comparison(self, response, answer, criteria, v
             ("1", "2", "response <= answer", True),
             ("2", "2", "response <= answer", True),
             ("3", "2", "response <= answer", False),
+            ("5", "9", "response > 3", True),
         ]
     )
     def test_criteria_order_comparison(self, response, answer, criteria, value):
@@ -1806,6 +1807,29 @@ def test_criteria_order_comparison(self, response, answer, criteria, value):
         result = evaluation_function(response, answer, params)
         assert result["is_correct"] is value
 
+    @pytest.mark.parametrize(
+        "criteria, value",
+        [
+            ("response contains c", False),
+            ("response contains a", True),
+            ("response contains x", True),
+            ("response contains pi", True),
+            ("response contains 23", True),
+            ("response contains 3", False),
+            ("response contains answer", True),
+        ]
+    )
+    def test_contains_symbol(self, criteria, value):
+        response = "a+23+pi+sin(x)+y"
+        answer = "y"
+        params = {
+            "strict_syntax": False,
+            "elementary_functions": True,
+            "criteria": criteria,
+        }
+        result = evaluation_function(response, answer, params)
+        assert result["is_correct"] is value
+
     @pytest.mark.parametrize(
         "response, answer, value",
         [

app/utility/criteria_parsing.py

@@ -16,7 +16,8 @@
     (" *= *", "EQUALITY"),
     (" *(>=?|<=?|ORDER) *", "ORDER"),  # less than (or equal), < (<=), greater than (or equal), > (>=)
     (" *where *", "WHERE"),
-    (" *written as *", "WRITTEN_AS"),
+    (" *written +as *", "WRITTEN_AS"),
+    (" *contains *", "CONTAINS"),
     (" *; *", "SEPARATOR"),
     (" *OTHER *", "OTHER", catch_undefined),
 ]
@@ -29,6 +30,8 @@
     ("BOOL", "EQUAL where EQUAL_LIST", infix),
     ("BOOL", "RESERVED written as OTHER", infix),
     ("BOOL", "RESERVED written as RESERVED", infix),
+    ("BOOL", "RESERVED contains OTHER", infix),
+    ("BOOL", "RESERVED contains RESERVED", infix),
     ("EQUAL_LIST", "EQUAL;EQUAL", infix),
     ("EQUAL_LIST", "EQUAL_LIST;EQUAL", append_last),
     ("EQUAL", "OTHER = OTHER", infix),