Merge pull request #215 from lambda-feedback/tr186-add-integral-as-elementary-function

Fixed regression after major update

Author: KarlLundengaard

app/tests/symbolic_evaluation_tests.py

@@ -1960,5 +1960,25 @@ def test_input_symbols_takes_priority_when_containing_elementary_function_names_
         result = evaluation_function(response, answer, params)
         assert result["is_correct"] is True
 
+    def test_integral(self):
+        response = "6y"
+        answer = "int(3*x*y, (x, 0, 2))"
+        params = {
+            "strict_syntax": False,
+            "elementary_functions": True,
+        }
+        result = evaluation_function(response, answer, params)
+        assert result["is_correct"] is True
+
+    def test_abstract_integral(self):
+        response = "int(f(x)+g(x), (x, a, b))"
+        answer = "int(g(x)+f(x), (x, a, b))"
+        params = {
+            "strict_syntax": False,
+            "elementary_functions": True,
+        }
+        result = evaluation_function(response, answer, params)
+        assert result["is_correct"] is True
+
 if __name__ == "__main__":
     pytest.main(['-xk not slow', "--tb=line", '--durations=10', os.path.abspath(__file__)])

app/utility/expression_utilities.py

@@ -62,7 +62,7 @@ def _print_log(self, expr, exp=None):
     # Special symbols to make sure plus_minus and minus_plus are not destroyed during preprocessing
     ('plus_minus', []), ('minus_plus', []),
     # Below this line should probably not be collected with elementary functions. Some like 'common operations' would be a better name
-    ('summation', ['sum', 'Sum']), ('Derivative', ['diff']), ('re', ['real']), ('im', ['imag']), ('conjugate', ['conj'])
+    ('summation', ['sum', 'Sum']), ('Integral', ['int']), ('Derivative', ['diff']), ('re', ['real']), ('im', ['imag']), ('conjugate', ['conj'])
 ]
 for data in elementary_functions_names:
     upper_case_alternatives = [data[0].upper()]