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

Added Integral as an elementary function

Author: KarlLundengaard

app/expression_utilities.py

@@ -45,7 +45,7 @@ def _print_log(self, expr, exp=None):
     ('exp', ['Exp']), ('E', ['e']), ('log', ['ln']),
     ('sqrt', []), ('sign', []), ('Abs', ['abs']), ('Max', ['max']), ('Min', ['min']), ('arg', []), ('ceiling', ['ceil']), ('floor', []),
     # 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']), ('Derivative', ['diff']), ('Integral', ['int']), ('re', ['real']), ('im', ['imag']), ('conjugate', ['conj'])
 ]
 for data in elementary_functions_names:
     upper_case_alternatives = [data[0].upper()]

app/symbolic_comparison_evaluation_tests.py

@@ -1574,5 +1574,25 @@ def test_alternatives_to_input_symbols_takes_priority_over_elementary_function_a
         result = evaluation_function(response, answer, params)
         assert result["is_correct"] is False
 
+    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__)])