Center all equations and use `breqn` for breaks

pysr/export_latex.py

@@ -3,6 +3,10 @@ import sympy
 from sympy.printing.latex import LatexPrinter
 import pandas as pd
 from typing import List
+import warnings
+
+
+raised_long_equation_warning = False
 
 
 class PreciseLatexPrinter(LatexPrinter):
@@ -26,7 +30,7 @@ def to_latex(expr, prec=3, full_prec=True, **settings):
 
 
 def generate_table_environment(columns=["equation", "complexity", "loss"]):
-    margins = "".join([("l" if col == "equation" else "c") for col in columns])
+    margins = "c" * len(columns)
     column_map = {
         "complexity": "Complexity",
         "loss": "Loss",
@@ -65,6 +69,8 @@ def generate_single_table(
     """Generate a booktabs-style LaTeX table for a single set of equations."""
     assert isinstance(equations, pd.DataFrame)
 
+    global raised_long_equation_warning
+
     latex_top, latex_bottom = generate_table_environment(columns)
     latex_table_content = []
 
@@ -92,17 +98,20 @@ def generate_single_table(
                 if len(latex_equation) < max_equation_length:
                     row_pieces.append("$" + latex_equation + "$")
                 else:
+                    if not raised_long_equation_warning:
+                        warnings.warn(
+                            "Please add \\usepackage{breqn} to your LaTeX preamble."
+                        )
+                        raised_long_equation_warning = True
+
                     broken_latex_equation = " ".join(
                         [
-                            r"\vbox{",
+                            r"\begin{minipage}{0.8\linewidth}",
                             r"\vspace{-1em}",
-                            r"\begin{flushleft}",
-                            r"$\displaystyle",
+                            r"\begin{dmath*}",
                             latex_equation,
-                            "$",
-                            r"\end{flushleft}",
-                            r"\vspace{-1em}",
-                            "}",
+                            r"\end{dmath*}",
+                            r"\end{minipage}",
                         ]
                     )
                     row_pieces.append(broken_latex_equation)

test/test.py

@@ -524,7 +524,7 @@ class TestLaTeXTable(unittest.TestCase):
             true_latex_table_str = r"""
                 \begin{table}[h]
                 \begin{center}
-                \begin{tabular}{@{}lccc@{}}
+                \begin{tabular}{@{}cccc@{}}
                 \toprule
                 Equation & Complexity & Loss & Score \\
                 \midrule"""
@@ -532,7 +532,7 @@ class TestLaTeXTable(unittest.TestCase):
             true_latex_table_str = r"""
                 \begin{table}[h]
                 \begin{center}
-                \begin{tabular}{@{}lcc@{}}
+                \begin{tabular}{@{}ccc@{}}
                 \toprule
                 Equation & Complexity & Loss \\
                 \midrule"""
@@ -669,7 +669,7 @@ class TestLaTeXTable(unittest.TestCase):
         middle_part = r"""
         $x_{0}$ & $1$ & $1.05$ & $0.0$ \\
         $\cos{\left(x_{0} \right)}$ & $2$ & $0.0232$ & $3.82$ \\
-        \vbox{ \vspace{-1em} \begin{flushleft} $\displaystyle x_{0}^{5} + x_{0}^{3} + 3.20 x_{0} + x_{1}^{3} - 1.20 x_{1} - 5.20 \sin{\left(2.60 x_{0} - 0.326 \sin{\left(x_{2} \right)} \right)} - \cos{\left(x_{0} x_{1} \right)} + \cos{\left(x_{0}^{3} + 3.20 x_{0} + x_{1}^{3} - 1.20 x_{1} + \cos{\left(x_{0} x_{1} \right)} \right)} $ \end{flushleft} \vspace{-1em} } & $30$ & $1.12 \cdot 10^{-15}$ & $1.09$ \\
+        \begin{minipage}{0.8\linewidth} \vspace{-1em} \begin{dmath*} x_{0}^{5} + x_{0}^{3} + 3.20 x_{0} + x_{1}^{3} - 1.20 x_{1} - 5.20 \sin{\left(2.60 x_{0} - 0.326 \sin{\left(x_{2} \right)} \right)} - \cos{\left(x_{0} x_{1} \right)} + \cos{\left(x_{0}^{3} + 3.20 x_{0} + x_{1}^{3} - 1.20 x_{1} + \cos{\left(x_{0} x_{1} \right)} \right)} \end{dmath*} \end{minipage} & $30$ & $1.12 \cdot 10^{-15}$ & $1.09$ \\
         """
         true_latex_table_str = self.create_true_latex(middle_part, include_score=True)
         self.assertEqual(latex_table_str, true_latex_table_str)