Merge branch 'main' into 159-feature-request-add-formula-58-from-nen_en_1992_1_1_c2_2011

Author: egarciamendez

.pre-commit-config.yaml

@@ -17,7 +17,7 @@
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.4
+    rev: v0.3.5
     hooks:
       # Run the linter.
       - id: ruff

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_9_detailling_and_specific_rules/formula_9_1n.py

@@ -60,15 +60,16 @@ def _evaluate(
 
     def latex(self) -> LatexFormula:
         """Returns LatexFormula object for formula 9.1N."""
+        fraction = latex_fraction(numerator=f"{self.f_ctm:.2f}", denominator=f"{self.f_yk:.2f}")
         return LatexFormula(
             return_symbol=r"A_{s,min}",
             result=f"{self:.2f}",
             equation=latex_max_curly_brackets(
-                rf"0.26 \cdot {latex_fraction(r'f_{ctm}', r'f_{yk}')} \cdot b_t \cdot d",
+                rf"0.26 \cdot {latex_fraction(numerator=r'f_{ctm}', denominator=r'f_{yk}')} \cdot b_t \cdot d",
                 r"0.0013 \cdot b_t \cdot d",
             ),
             numeric_equation=latex_max_curly_brackets(
-                rf"0.26 \cdot {latex_fraction(f'{self.f_ctm:.2f}', f'{self.f_yk:.2f}')} \cdot {self.b_t:.2f} \cdot {self.d:.2f}",
+                rf"0.26 \cdot {fraction} \cdot {self.b_t:.2f} \cdot {self.d:.2f}",
                 rf"0.0013 \cdot {self.b_t:.2f} \cdot {self.d:.2f}",
             ),
             comparison_operator_label="=",

blueprints/codes/eurocode/nen_en_1993_5_2008/chapter_5_ultimate_limit_states/formula_5_9.py

@@ -97,6 +97,7 @@ def latex(self) -> LatexFormula:
         latex_equation = latex_min_curly_brackets(
             r"\left(\beta_b \cdot W_{pl} - \frac{\rho \cdot A_v^2}{4 \cdot t_w \cdot \sin(\alpha)}\right) \cdot \frac{f_y}{\gamma_{M0}}, M_{c,Rd}"
         )
+        fraction = latex_fraction(numerator=f"{self.f_y:.2f}", denominator=f"{self.gamma_m_0:.2f}")
         return LatexFormula(
             return_symbol=r"M_{V,Rd}",
             result=f"{self:.3f}",
@@ -105,7 +106,7 @@ def latex(self) -> LatexFormula:
                 latex_min_curly_brackets(
                     rf"\left({self.beta_b:.2f} \cdot {self.w_pl:.2f} - \frac{{{self.rho:.2f} \cdot {self.a_v:.2f}^2}}{{4 \cdot {self.t_w:.2f} \cdot "
                     rf"\sin({self.alpha:.2f})}}\right) \cdot "
-                    rf"{latex_fraction(f'{self.f_y:.2f}', f'{self.gamma_m_0:.2f}')} \cdot 10^{{-6}}, {self.mc_rd:.2f}"
+                    rf"{fraction} \cdot 10^{{-6}}, {self.mc_rd:.2f}"
                 )
             ),
             comparison_operator_label="=",

requirements_dev.txt

@@ -1,5 +1,5 @@
 mypy==1.9.0
-ruff==0.3.4
+ruff==0.3.5
 isort==5.13.2
 pre-commit==3.7.0
 pytest==8.1.1