Merge pull request #137 from lambda-feedback/tr112-atol-rtol-zero-behaviour

Modified condition for numerical comparison to check if atol or rtol …

Author: KarlLundengaard

app/symbolic_comparison_evaluation.py

@@ -271,7 +271,7 @@ def symbolic_comparison(response, answer, params, eval_response) -> dict:
  error_below_rtol = None
 
  if eval_response.is_correct is False:
- if params.get("numerical", False) or params.get("rtol", False) or params.get("atol", False):
+ if params.get("numerical", False) or float(params.get("rtol", 0)) > 0 or float(params.get("atol", 0)) > 0:
  # REMARK: 'pi' should be a reserved symbol but it is sometimes not treated as one, possibly because of input symbols.
  # The two lines below this comments fixes the issue but a more robust solution should be found for cases where there
  # are other reserved symbols.

app/symbolic_comparison_evaluation_tests.py

@@ -552,6 +552,54 @@ def test_empty_input_symbols_codes_and_alternatives(self):
  @pytest.mark.parametrize(
  "description,response,answer,tolerance,tags,outcome",
  [
+ (
+ "Correct response, symbolic comparison set with atol=0",
+ "sqrt(3)+5",
+ "sqrt(3)+5",
+ {"atol": 0},
+ [],
+ True
+ ),
+ (
+ "Incorrect response, symbolic comparison set with atol=0",
+ "sqrt(3)+5",
+ "6.73",
+ {"atol": 0},
+ [],
+ False
+ ),
+ (
+ "Correct response, symbolic comparison set with rtol=0",
+ "sqrt(3)+5",
+ "sqrt(3)+5",
+ {"rtol": 0},
+ [],
+ True
+ ),
+ (
+ "Incorrect response, symbolic comparison set with rtol=0",
+ "sqrt(3)+5",
+ "6.73",
+ {"rtol": 0},
+ [],
+ False
+ ),
+ (
+ "Correct response, symbolic comparison set with atol=0 and rtol=0",
+ "sqrt(3)+5",
+ "sqrt(3)+5",
+ {"rtol": 0, "atol": 0},
+ [],
+ True
+ ),
+ (
+ "Incorrect response, symbolic comparison set with atol=0 and rtol=0",
+ "sqrt(3)+5",
+ "6.73",
+ {"rtol": 0, "atol": 0},
+ [],
+ False
+ ),
  (
  "Correct response, tolerance specified with atol",
  "6.73",