Merge pull request #204 from lambda-feedback/tr173-changed-preview-code-gen-for-latex-response-with-pm

Changed preview sympy code generation for responses in latex format w…

Author: KarlLundengaard

app/expression_utilities.py

@@ -78,8 +78,11 @@ def create_expression_set(exprs, params):
             expr = expr.replace(params["minus_plus"], "minus_plus")
 
         if ("plus_minus" in expr) or ("minus_plus" in expr):
-            expr_set.add(expr.replace("plus_minus", "+").replace("minus_plus", "-"))
-            expr_set.add(expr.replace("plus_minus", "-").replace("minus_plus", "+"))
+            for pm_mp_ops in [("+","-"),("-","+")]:
+                expr_string = expr.replace("plus_minus", pm_mp_ops[0]).replace("minus_plus", pm_mp_ops[1]).strip()
+                while expr_string[0] == "+":
+                    expr_string = expr_string[1:]
+                expr_set.add(expr_string.strip())
         else:
             expr_set.add(expr)
 

app/preview_utilities.py

@@ -8,6 +8,7 @@
     extract_latex,
     SymbolDict,
     find_matching_parenthesis,
+    create_expression_set,
 )
 
 class Params(TypedDict):
@@ -26,7 +27,7 @@ class Result(TypedDict):
     preview: Preview
 
 
-def parse_latex(response: str, symbols: SymbolDict, simplify : bool) -> str:
+def parse_latex(response: str, symbols: SymbolDict, simplify : bool, parameters=None) -> str:
     """Parse a LaTeX string to a sympy string while preserving custom symbols.
 
     Args:
@@ -40,6 +41,9 @@ def parse_latex(response: str, symbols: SymbolDict, simplify : bool) -> str:
     Returns:
         str: The expression in sympy syntax.
     """
+    if parameters is None:
+        parameters = dict()
+
     substitutions = {}
 
     pm_placeholder = None
@@ -56,8 +60,10 @@ def parse_latex(response: str, symbols: SymbolDict, simplify : bool) -> str:
 
     if pm_placeholder is not None:
         response = response.replace(r"\pm ", pm_placeholder)
+        substitutions[pm_placeholder] = sympy.Symbol(pm_placeholder, commutative=False)
     if mp_placeholder is not None:
         response = response.replace(r"\mp ", mp_placeholder)
+        substitutions[mp_placeholder] = sympy.Symbol(mp_placeholder, commutative=False)
 
     for sympy_symbol_str in symbols:
         symbol_str = symbols[sympy_symbol_str]["latex"]
@@ -73,8 +79,6 @@ def parse_latex(response: str, symbols: SymbolDict, simplify : bool) -> str:
                 )
             substitutions[latex_symbol] = sympy.Symbol(sympy_symbol_str)
 
-    substitutions.update({r"\pm ": pm_placeholder, r"\mp ": mp_placeholder})
-
     try:
         expression = latex2sympy(response, substitutions)
         if isinstance(expression, list):
@@ -84,13 +88,20 @@ def parse_latex(response: str, symbols: SymbolDict, simplify : bool) -> str:
     except Exception as e:
         raise ValueError(str(e))
 
-    result_str = str(expression.xreplace(substitutions))
-    for ph in [(pm_placeholder, "plus_minus"), (mp_placeholder, "minus_plus")]:
-        if ph[0] is not None:
-            result_str = result_str.replace("*"+ph[0]+"*", " "+ph[1]+" ")
-            result_str = result_str.replace(ph[0]+"*", " "+ph[1]+" ")
-            result_str = result_str.replace("*"+ph[0], " "+ph[1]+" ")
-            result_str = result_str.replace(ph[0], " "+ph[1]+" ")
+    if (pm_placeholder is not None) or (mp_placeholder is not None):
+        result_str_set = set()
+        result_str = str(expression)
+        for ph in [(pm_placeholder, "plus_minus"), (mp_placeholder, "minus_plus")]:
+            if ph[0] is not None:
+                result_str = result_str.replace("*"+ph[0]+"*", " "+ph[1]+" ")
+                result_str = result_str.replace(ph[0]+"*", " "+ph[1]+" ")
+                result_str = result_str.replace("*"+ph[0], " "+ph[1]+" ")
+                result_str = result_str.replace(ph[0], " "+ph[1]+" ")
+        for expr in create_expression_set(result_str, parameters):
+            result_str_set.add(expr)
+        result_str = '{'+', '.join(result_str_set)+'}'
+    else:
+        result_str = str(expression.xreplace(substitutions))
 
     return result_str
 

app/symbolic_comparison_preview_tests.py

@@ -77,6 +77,28 @@ def test_sympy_with_equality_symbol(self):
         preview = result["preview"]
         assert preview.get("latex") == "\\frac{x^{2} + x + x}{x} = 1"
 
+    def test_latex_with_plus_minus(self):
+        response = r"\pm \frac{3}{\sqrt{5}} i"
+        params = Params(
+            is_latex=True,
+            simplify=False,
+            complexNumbers=True,
+            symbols={
+                "I": {
+                    "latex": "$i$",
+                    "aliases": ["i"],
+                },
+                "plus_minus": {
+                    "latex": "$\\pm$",
+                    "aliases": ["pm", "+-"],
+                },
+            }
+        )
+        result = preview_function(response, params)
+        preview = result["preview"]
+        assert preview.get("sympy") in ['{3*i/sqrt(5), - 3*i/sqrt(5)}', '{- 3*i/sqrt(5), 3*i/sqrt(5)}']
+        assert preview.get("latex") == r'\pm \frac{3}{\sqrt{5}} i'
+
     def test_latex_conversion_preserves_default_symbols(self):
         response = "\\mu + x + 1"
         params = Params(is_latex=True, simplify=False)