Merge pull request #141 from lambda-feedback/tr114-comparing-real-and-imaginary-as-criteria

Fixed bug in input symbols substitution

Author: KarlLundengaard

app/evaluation.py

@@ -28,7 +28,7 @@ def evaluation_function(response, answer, params, include_test_data=False) -> di
     for input_symbol in params.get("input_symbols",[]):
         input_symbols_reserved_words += [input_symbol[0]]+input_symbol[1]
 
-    reserved_keywords = ["response","answer"]
+    reserved_keywords = ["response", "answer", "plus_minus", "minus_plus"]
     reserved_keywords_collisions = []
     for keyword in reserved_keywords:
         if keyword in input_symbols_reserved_words:
@@ -46,8 +46,6 @@ def evaluation_function(response, answer, params, include_test_data=False) -> di
     if params.get("is_latex",False):
         response = preview_function(response, params)["preview"]["sympy"]
 
-    answer, response = substitute_input_symbols([answer, response], parameters)
-
     if parameters.get("physical_quantity", False) is True:
         eval_response = quantity_comparison(response, answer, parameters, eval_response)
     else:

app/expression_utilities.py

@@ -522,12 +522,6 @@ def create_sympy_parsing_params(params, unsplittable_symbols=tuple(), symbol_ass
         zeta = Symbol("zeta")
     if params.get("complexNumbers", False) is True:
         from sympy import I
-#        imaginary_constant_index = None
-#        for (k, symbol) in enumerate(unsplittable_symbols):
-#            if "I" == symbol[0]:
-#                imaginary_constant_index = k
-#        if imaginary_constant_index is not None:
-#            unsplittable_symbols = unsplittable_symbols[0:imaginary_constant_index]+unsplittable_symbols[imaginary_constant_index+1:]
     else:
         I = Symbol("I")
     if params.get("elementary_functions", False) is True: