Generate table with scientific notation for floats

pysr/export_latex.py

@@ -5,6 +5,7 @@ from sympy.printing.latex import LatexPrinter
 
 class PreciseLatexPrinter(LatexPrinter):
     """Modified SymPy printer with custom float precision."""
+
     def __init__(self, settings=None, prec=3):
         super().__init__(settings)
         self.prec = prec

pysr/sr.py

@@ -2039,14 +2039,20 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
             # Also convert these to reduced precision:
             # loss = self.equations_.iloc[i]["loss"]
             # score = self.equations_.iloc[i]["score"]
-            complexity = "{:d}".format(self.equations_.iloc[i]["complexity"])
-            loss = "{:.{p}g}".format(self.equations_.iloc[i]["loss"], p=precision)
-            score = "{:.{p}g}".format(self.equations_.iloc[i]["score"], p=precision)
+            complexity = str(self.equations_.iloc[i]["complexity"])
+            loss = to_latex(
+                sympy.Float(self.equations_.iloc[i]["loss"]), prec=precision
+            )
+            score = to_latex(
+                sympy.Float(self.equations_.iloc[i]["score"]), prec=precision
+            )
 
-            row_pieces = ["$" + equation + "$", complexity, loss]
+            row_pieces = [equation, complexity, loss]
             if include_score:
                 row_pieces.append(score)
 
+            row_pieces = ["$" + piece + "$" for piece in row_pieces]
+
             latex_table_content.append(
                 " & ".join(row_pieces) + r" \\",
             )

test/test.py

@@ -540,9 +540,9 @@ class TestLaTeXTable(unittest.TestCase):
         # Regular table:
         latex_table_str = model.latex_table()
         middle_part = r"""
-            $x_{0}$ & 1 & 1.05 \\
-            $\cos{\left(x_{0} \right)}$ & 2 & 0.0232 \\
-            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & 8 & 1.12e-15 \\
+            $x_{0}$ & $1$ & $1.05$ \\
+            $\cos{\left(x_{0} \right)}$ & $2$ & $0.0232$ \\
+            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & $8$ & $1.12 \cdot 10^{-15}$ \\
         """
         true_latex_table_str = self.create_true_latex(middle_part)
         self.assertEqual(latex_table_str, true_latex_table_str)
@@ -550,9 +550,9 @@ class TestLaTeXTable(unittest.TestCase):
         # Different precision:
         latex_table_str = model.latex_table(precision=5)
         middle_part = r"""
-            $x_{0}$ & 1 & 1.052 \\
-            $\cos{\left(x_{0} \right)}$ & 2 & 0.02315 \\
-            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & 8 & 1.1235e-15 \\
+            $x_{0}$ & $1$ & $1.052$ \\
+            $\cos{\left(x_{0} \right)}$ & $2$ & $0.02315$ \\
+            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & $8$ & $1.1235 \cdot 10^{-15}$ \\
         """
         true_latex_table_str = self.create_true_latex(middle_part)
         self.assertEqual(latex_table_str, self.create_true_latex(middle_part))
@@ -560,9 +560,9 @@ class TestLaTeXTable(unittest.TestCase):
         # Including score:
         latex_table_str = model.latex_table(include_score=True)
         middle_part = r"""
-            $x_{0}$ & 1 & 1.05 & 0 \\
-            $\cos{\left(x_{0} \right)}$ & 2 & 0.0232 & 3.82 \\
-            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & 8 & 1.12e-15 & 5.11 \\
+            $x_{0}$ & $1$ & $1.05$ & $0.0$ \\
+            $\cos{\left(x_{0} \right)}$ & $2$ & $0.0232$ & $3.82$ \\
+            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & $8$ & $1.12 \cdot 10^{-15}$ & $5.11$ \\
         """
         true_latex_table_str = self.create_true_latex(middle_part, include_score=True)
         self.assertEqual(latex_table_str, true_latex_table_str)
@@ -570,7 +570,7 @@ class TestLaTeXTable(unittest.TestCase):
         # Only last equation:
         latex_table_str = model.latex_table(indices=[2])
         middle_part = r"""
-            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & 8 & 1.12e-15 \\
+            $x_{0} + x_{1} - \cos{\left(x_{0} x_{1} \right)}$ & $8$ & $1.12 \cdot 10^{-15}$ \\
         """
         true_latex_table_str = self.create_true_latex(middle_part)
         self.assertEqual(latex_table_str, true_latex_table_str)
@@ -595,4 +595,4 @@ class TestLaTeXTable(unittest.TestCase):
         )
         self.assertEqual(
             to_latex(expr, prec=8), "3232.3249 x - 1.4857485 \cdot 10^{-10}"
-        )
+        )