Merge pull request #218 from lambda-feedback/tr124-restructuring

Made simplified responses in the result more simplified

Author: KarlLundengaard

app/evaluation.py

@@ -256,14 +256,6 @@ def evaluation_function(response, answer, params, include_test_data=False) -> di
             parameters.update({key: value})
     if "criteria" not in parameters.keys():
         parameters.update({"criteria": ",".join(context["default_criteria"])})
-    try:
-        preview = context["expression_preview"](response, deepcopy(parameters))["preview"]
-    except Exception:
-        evaluation_result.latex = response
-        evaluation_result.simplified = response
-    else:
-        evaluation_result.latex = preview["latex"]
-        evaluation_result.simplified = preview["sympy"]
 
     reserved_expressions_keys = list(reserved_expressions_strings["learner"].keys())+list(reserved_expressions_strings["task"].keys())
     parameters.update(
@@ -301,6 +293,22 @@ def evaluation_function(response, answer, params, include_test_data=False) -> di
         return evaluation_result.serialise(include_test_data)
     reserved_expressions_parsed = {**reserved_expressions["learner"], **reserved_expressions["task"]}
 
+    try:
+        preview = context["expression_preview"](response, deepcopy(parameters))["preview"]
+    except Exception:
+        evaluation_result.latex = response
+        evaluation_result.simplified = response
+    else:
+        evaluation_result.latex = preview["latex"]
+        parsed_response = reserved_expressions["learner"]["response"]
+        if isinstance(parsed_response, list) or isinstance(parsed_response, set):
+            evaluation_result.simplified = ", ".join([str(ex.simplify()) for ex in parsed_response])
+        else:
+            try:
+                evaluation_result.simplified = str(parsed_response.simplify())
+            except Exception:
+                evaluation_result.simplified = response
+
     criteria_parser = context["generate_criteria_parser"](reserved_expressions)
     criteria = create_criteria_dict(criteria_parser, parameters)
 

app/evaluation_tests.py

@@ -29,7 +29,7 @@ class TestEvaluationFunction():
     from .tests.physical_quantity_evaluation_tests import TestEvaluationFunction as TestQuantities
 
     # Import tests that corresponds to examples in documentation and examples module
-    #from .tests.example_tests import TestEvaluationFunction as TestExamples
+    from .tests.example_tests import TestEvaluationFunction as TestExamples
 
     def test_eval_function_can_handle_latex_input(self):
         response = r"\sin x + x^{7}"

app/tests/symbolic_evaluation_tests.py

@@ -471,19 +471,29 @@ def test_plus_minus_all_answers_incorrect(self, response, answer):
         result = evaluation_function(response, answer, params)
         assert result["is_correct"] is False
 
-    def test_simplified_in_correct_response(self):
-        response = "a*x + b"
-        answer = "b + a*x"
-        result = evaluation_function(response, answer, {})
-        assert result["is_correct"] is True
-        assert result["response_simplified"] == "a*x + b"
-
-    def test_simplified_in_wrong_response(self):
-        response = "a*x + b"
-        answer = "b + a*x + 8"
+    @pytest.mark.parametrize(
+        "response, answer, simplified",
+        [
+            (
+                "b + a*x",
+                "a*x + b",
+                "a*x + b"
+            ),
+            (
+                "b + a*x + 8",
+                "a*x + b",
+                "a*x + b + 8"
+            ),
+            (
+                "b + a*x + y - y",
+                "a*x + b",
+                "a*x + b"
+            ),
+        ]
+    )
+    def test_simplified(self, response, answer, simplified):
         result = evaluation_function(response, answer, {})
-        assert result["is_correct"] is False
-        assert result["response_simplified"] == "a*x + b"
+        assert result["response_simplified"] == simplified
 
     @pytest.mark.parametrize(
         "response,answer",