correcao de equacoes para excel

backend/app/services/equacao_service.py

@@ -247,24 +247,31 @@ def _build_formula_excel_sab(
     transf_y = _normalize_transform(transformacao_y)
     # Forma direta sem EXP/LN quando y esta em log.
     if transf_y == "ln(x)":
-        base_linear = _compose_linear_expression(
-            params=params,
-            colunas_x=colunas_x,
-            transformacoes_x=transformacoes_x,
-            var_resolver=var_resolver,
-            mode=_MODE_EXCEL_SAB,
-            include_ln_terms=False,
-        )
-        expr = f"({_E_CONST_BR}^({base_linear}))"
+        partes: list[str] = []
+        partes.append(_format_number_br(math.exp(_resolve_const(params))))
+
+        # Primeiro os termos ln(x), que viram x^coef (mais legivel no estilo SAB).
         for coluna in colunas_x:
+            coef = _resolve_coef(params, coluna)
+            if abs(coef) < 1e-15:
+                continue
             transf = _normalize_transform(transformacoes_x.get(coluna, "(x)"))
             if transf != "ln(x)":
                 continue
+            partes.append(f"{var_resolver(coluna)}^{_format_number_br(coef)}")
+
+        # Depois os demais termos, na forma exp(coef)^termo.
+        for coluna in colunas_x:
             coef = _resolve_coef(params, coluna)
             if abs(coef) < 1e-15:
                 continue
-            expr += f"*(({var_resolver(coluna)})^{_format_number_br(coef)})"
-        return "=" + expr
+            transf = _normalize_transform(transformacoes_x.get(coluna, "(x)"))
+            if transf == "ln(x)":
+                continue
+            termo = _term_expr_excel(transf, var_resolver(coluna), _MODE_EXCEL_SAB)
+            partes.append(f"{_format_number_br(math.exp(coef))}^{termo}")
+
+        return "= " + " * ".join(partes)
 
     linear = _compose_linear_expression(
         params=params,
@@ -304,24 +311,29 @@ def _build_formula_calc_excel_sab(
 ) -> str:
     transf_y = _normalize_transform(transformacao_y)
     if transf_y == "ln(x)":
-        base_linear = _compose_linear_expression_calc(
-            params=params,
-            colunas_x=colunas_x,
-            transformacoes_x=transformacoes_x,
-            var_resolver=var_resolver,
-            mode=_MODE_EXCEL_SAB,
-            include_ln_terms=False,
-        )
-        expr = f"({_E_CONST_DOT}^({base_linear}))"
+        partes: list[str] = []
+        partes.append(_format_number_calc(math.exp(_resolve_const(params))))
+
         for coluna in colunas_x:
+            coef = _resolve_coef(params, coluna)
+            if abs(coef) < 1e-15:
+                continue
             transf = _normalize_transform(transformacoes_x.get(coluna, "(x)"))
             if transf != "ln(x)":
                 continue
+            partes.append(f"{var_resolver(coluna)}^{_format_number_calc(coef)}")
+
+        for coluna in colunas_x:
             coef = _resolve_coef(params, coluna)
             if abs(coef) < 1e-15:
                 continue
-            expr += f"*(({var_resolver(coluna)})^{_format_number_calc(coef)})"
-        return "=" + expr
+            transf = _normalize_transform(transformacoes_x.get(coluna, "(x)"))
+            if transf == "ln(x)":
+                continue
+            termo = _term_expr_calc(transf, var_resolver(coluna), _MODE_EXCEL_SAB)
+            partes.append(f"{_format_number_calc(math.exp(coef))}^{termo}")
+
+        return "=" + "*".join(partes)
 
     linear = _compose_linear_expression_calc(
         params=params,