Merge pull request #227 from lambda-feedback/bug/fix-inappropriate-symbol-and-!-for-factorial

Bug/fix inappropriate symbol and ! for factorial

Author: m-messer

app/evaluation.py

@@ -288,6 +288,10 @@ def evaluation_function(response, answer, params, include_test_data=False) -> di
  if "!" in response:
  evaluation_result.add_feedback(("NOTATION_WARNING_FACTORIAL", symbolic_comparison_internal_messages("NOTATION_WARNING_FACTORIAL")(dict())))
 
+ if "!!!" in response:
+ evaluation_result.add_feedback(
+ ("NOTATION_WARNING_TRIPLE_FACTORIAL", symbolic_comparison_internal_messages("NOTATION_WARNING_TRIPLE_FACTORIAL")(dict())))
+
  reserved_expressions_success, reserved_expressions = parse_reserved_expressions(reserved_expressions_strings, parameters, evaluation_result)
  if reserved_expressions_success is False:
  return evaluation_result.serialise(include_test_data)

app/feedback/symbolic.py

@@ -21,6 +21,7 @@
  "PARSE_ERROR": f"`{inputs.get('x','')}` could not be parsed as a valid mathematical expression. Ensure that correct codes for input symbols are used, correct notation is used, that the expression is unambiguous and that all parentheses are closed.",
  "NOTATION_WARNING_EXPONENT": "Note that `^` cannot be used to denote exponentiation, use `**` instead.",
  "NOTATION_WARNING_FACTORIAL": "Note that `!` cannot be used to denote factorial, use `factorial(...)` instead.",
+ "NOTATION_WARNING_TRIPLE_FACTORIAL": "Note that `!!!` is not supported.",
  "EXPRESSION_NOT_EQUALITY": "The response was an expression but was expected to be an equality.",
  "EQUALITY_NOT_EXPRESSION": "The response was an equality but was expected to be an expression.",
  "EQUALITIES_EQUIVALENT": None,

app/requirements.txt

@@ -1,6 +1,6 @@
 pydot
 typing_extensions
 mpmath==1.2.1
-sympy==1.12
+sympy==1.14
 antlr4-python3-runtime==4.7.2
 git+https://github.com/lambda-feedback/latex2sympy.git@master#egg=latex2sympy2

app/tests/symbolic_evaluation_tests.py

@@ -775,10 +775,6 @@ def test_warning_inappropriate_symbol(self):
  '(0,002*6800*v)/1,2',
  '(0.002*6800*v)/1.2'
  ),
- (
- '-∞',
- '-inf'
- ),
  (
  'x.y',
  'x*y'
@@ -1865,15 +1861,52 @@ def test_sum_in_answer(self, response, answer, value):
  result = evaluation_function(response, answer, params)
  assert result["is_correct"] is value
 
- def test_exclamation_mark_for_factorial(self):
- response = "3!"
- answer = "factorial(3)"
+ @pytest.mark.parametrize(
+ "response, answer, value",
+ [
+ ("3!", "factorial(3)", True),
+ ("(n+1)!", "factorial(n+1)", True),
+ ("n!", "factorial(n)", True),
+ ("a!=b", "factorial(3)", False),
+ ("2*n!", "2*factorial(n)", True),
+ ("3!", "3!", True),
+ ("3*sin(n)!", "3*factorial(sin(n))", True)
+ ]
+ )
+ def test_exclamation_mark_for_factorial(self, response, answer, value):
  params = {
  "strict_syntax": False,
  "elementary_functions": True,
  }
  result = evaluation_function(response, answer, params)
- assert result["is_correct"] is True
+ assert result["is_correct"] is value
+
+ @pytest.mark.parametrize(
+ "response, answer, value",
+ [
+ ("3!!", "factorial2(3)", True),
+ ("(n+1)!!", "factorial2(n+1)", True),
+ ("n!!", "factorial2(n)", True),
+ ("a!=b", "factorial2(3)", False),
+ ("2*n!!", "2*factorial2(n)", True),
+ ("3!!", "3!!", True),
+ ]
+ )
+ def test_double_exclamation_mark_for_factorial(self, response, answer, value):
+ params = {
+ "strict_syntax": False,
+ "elementary_functions": True,
+ }
+ result = evaluation_function(response, answer, params)
+ assert result["is_correct"] is value
+
+ def test_warning_for_triple_factorial(self):
+ answer = '2^4!'
+ response = '2^4!!!'
+ params = {'strict_syntax': False}
+ result = evaluation_function(response, answer, params, include_test_data=True)
+ assert result["is_correct"] is False
+ assert "NOTATION_WARNING_TRIPLE_FACTORIAL" in result["tags"]
 
  def test_alternatives_to_input_symbols_takes_priority_over_elementary_function_alternatives(self):
  answer = "Ef*exp(x)"

app/utility/expression_utilities.py

@@ -691,17 +691,20 @@ def parse_expression(expr_string, parsing_params):
  substitutions.sort(key=substitutions_sort_key)
  if parsing_params["elementary_functions"] is True:
  substitutions += protect_elementary_functions_substitutions(expr)
+
  substitutions = list(set(substitutions))
  substitutions.sort(key=substitutions_sort_key)
  expr = substitute(expr, substitutions)
  expr = " ".join(expr.split())
+
  can_split = lambda x: False if x in unsplittable_symbols else _token_splittable(x)
  if strict_syntax is True:
  transformations = parser_transformations[0:4]+extra_transformations
  else:
  transformations = parser_transformations[0:5, 6]+extra_transformations+(split_symbols_custom(can_split),)+parser_transformations[8, 9]
  if parsing_params.get("rationalise", False):
  transformations += parser_transformations[11]
+
  if "=" in expr:
  expr_parts = expr.split("=")
  lhs = parse_expr(expr_parts[0], transformations=transformations, local_dict=symbol_dict)
@@ -713,6 +716,7 @@ def parse_expression(expr_string, parsing_params):
  parsed_expr = parsed_expr.simplify()
  else:
  parsed_expr = parse_expr(expr, transformations=transformations, local_dict=symbol_dict, evaluate=False)
+
  if not isinstance(parsed_expr, Basic):
  raise ValueError(f"Failed to parse Sympy expression `{expr}`")
  parsed_expr_set.add(parsed_expr)