520 feature request set n decimals as abstract method to latex formula #522

johan-tuls · 2025-03-05T14:32:42Z

Description

Please write a description of the changes you made here.

Fixes # (issue)

Type of change

Please delete options that are not relevant.

Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

[ X] I have added tests that prove my fix is effective or that my feature works
[ X] I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
[X ] New and existing unit tests pass locally with my changes

Co-authored-by: PabloVasconez <pvascon@hotmail.com>

# Conflicts: # blueprints/type_alias.py

github-actions · 2025-03-05T14:32:55Z

Thank you so much for contributing to Blueprints! This is your Pull Request # 2 to this project.
Your contributions help thousands of engineers work more efficiently and accurately.

Now that you've created your pull request, please don't go away; take a look at the bottom of this page for the automated checks that should already be running. If they pass, great! If not, please click on 'Details' and see if you can fix the problem they've identified. A maintainer should be along shortly to review your pull request and help get it added!

GerjanDorgelo · 2025-03-07T18:06:56Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_3_materials/formula_3_12.py

@@ -41,12 +41,12 @@ def _evaluate(
            raise ValueError(f"Invalid f_ck: {f_ck}. f_ck cannot be negative")
        return 2.5 * (f_ck - 10) * 10**-6

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 3.12."""
        return LatexFormula(
            return_symbol=r"\epsilon_{ca}(\infty)",
            result=f"{self:.6f}",


this one is not editable now. But it also cannot be the same amount of decimals as the others, as this value in particular is small. We need to think about a fix. Maybe max(6, n)?

GerjanDorgelo · 2025-03-07T18:07:08Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_3_materials/formula_3_28.py

@@ -57,15 +57,15 @@ def _evaluate(
            raise ValueError(f"Invalid t: {t}. t cannot be negative")
        return 5.39 * rho_1000 * np.exp(6.7 * mu) * (t / 1000) ** (0.75 * (1 - mu)) * 10**-5

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 3.28."""
        return LatexFormula(
            return_symbol=r"\frac{\Delta \sigma_{pr}}{\sigma_{pl}}",
            result=f"{self:.6f}",


same as before

GerjanDorgelo · 2025-03-07T18:07:14Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_3_materials/formula_3_29.py

@@ -57,15 +57,15 @@ def _evaluate(
            raise ValueError(f"Invalid t: {t}. t cannot be negative")
        return 0.66 * rho_1000 * np.exp(9.1 * mu) * (t / 1000) ** (0.75 * (1 - mu)) * 10**-5

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 3.29."""
        return LatexFormula(
            return_symbol=r"\frac{\Delta \sigma_{pr}}{\sigma_{pl}}",
            result=f"{self:.6f}",


same as before

GerjanDorgelo · 2025-03-07T18:07:19Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_3_materials/formula_3_30.py

@@ -57,15 +57,15 @@ def _evaluate(
            raise ValueError(f"Invalid t: {t}. t cannot be negative")
        return 1.98 * rho_1000 * np.exp(8 * mu) * (t / 1000) ** (0.75 * (1 - mu)) * 10**-5

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 3.30."""
        return LatexFormula(
            return_symbol=r"\frac{\Delta \sigma_{pr}}{\sigma_{pl}}",
            result=f"{self:.6f}",


same as before

GerjanDorgelo · 2025-03-07T18:07:25Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_34.py

@@ -62,13 +62,14 @@ def _evaluate(

        return k_r * k_phi * (f_yd / e_s) / (0.45 * d)

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 5.34."""
        return LatexFormula(
            return_symbol=r"\frac{1}{r}",
            result=f"{self:.6f}",


same as before

GerjanDorgelo · 2025-03-07T18:08:08Z

...des/eurocode/nen_en_1992_1_1_c2_2011/chapter_9_detailling_and_specific_rules/formula_9_5n.py

@@ -41,12 +41,12 @@ def _evaluate(f_ck: MPA, f_yk: MPA) -> DIMENSIONLESS:
        raise_if_negative(f_ck=f_ck, f_yk=f_yk)
        return (0.08 * np.sqrt(f_ck)) / f_yk

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 2) -> LatexFormula:
        """Returns LatexFormula object for formula 9.5N."""
        return LatexFormula(
            return_symbol=r"\rho_{w,min}",
            result=f"{self:.6f}",


same as before

GerjanDorgelo · 2025-03-07T18:09:04Z

blueprints/type_alias.py

@@ -95,6 +95,8 @@
 """Newton per square meter (N/m²), represented as a float."""
 KN_M2 = float
 """Kilonewton per square meter (kN/m²), represented as a float."""
+KN_M3 = float
+"""Kilonewton per cubic meter (kN/m3), represented as a float."""


GerjanDorgelo · 2025-03-07T18:13:57Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_2.py

@@ -44,12 +44,12 @@ def _evaluate(
        raise_if_less_or_equal_to_zero(l_0=l_0)
        return theta_i * l_0 / 2

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 5.2."""
        return LatexFormula(
            return_symbol=r"e_i",
            result=f"{self:.4f}",


same as before

GerjanDorgelo · 2025-03-07T18:14:12Z

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_1.py

@@ -53,13 +53,13 @@ def _evaluate(
        raise_if_negative(theta_0=theta_0, alpha_h=alpha_h, alpha_m=alpha_m)
        return theta_0 * alpha_h * alpha_m

-    def latex(self) -> LatexFormula:
+    def latex(self, n: int = 3) -> LatexFormula:
        """Returns LatexFormula object for formula 5.1."""
        return LatexFormula(
            return_symbol=r"\theta_i",
            result=f"{self:.4f}",


same as before

GerjanDorgelo · 2025-03-07T18:17:55Z

blueprints/codes/cur/cur_228/formula_2_22.py

+        msg = "Radius is equal to- or larger than 0.3m, use: Eq2Dot21ModulusHorizontalSubgrade"
+        raise ValueError(msg)
+
+    def latex(self, n: int = 3) -> LatexFormula:


nothing is preventing a user from submitting a negative value. maybe its wice to always pick the larger value of 0 and n?

…ct-method-to-latex-formula

GerjanDorgelo · 2025-03-07T18:19:52Z

Because of merges to the main, there are a few extra files that require this change.

…ct-method-to-latex-formula

johan-tuls-bam and others added 11 commits October 16, 2024 12:04

#355 Added menard equations 2.21 and 2.22 of CUR 288

068cefd

#355 Feedback naming ModulusHorizontalSubgrade

418df4a

Update blueprints/codes/cur/cur_228/formula_2_22.py

05ee0a2

Co-authored-by: PabloVasconez <pvascon@hotmail.com>

Merge branch 'main' into 355-feature-request-menard-stiffness-cur-228

2cb0db1

Merge branch 'main' into 355-feature-request-menard-stiffness-cur-228

31a5cfd

Merge branch 'main' into 355-feature-request-menard-stiffness-cur-228

0b34943

# Conflicts: # blueprints/type_alias.py

355 Added additional checks.

35f66d4

355 Update how to handle decimals in latex

3c8652b

355 Fix coverage

7c69e78

355 Fix tests

3ff74cd

520 Latex abstract method

5e5d08b

johan-tuls requested a review from GerjanDorgelo March 5, 2025 14:32

johan-tuls linked an issue Mar 5, 2025 that may be closed by this pull request

[✨ Feature request]: Set n decimals as abstract method to latex Formula #520

Open

2 tasks

520 Fix test coverage

6f36d74

johan-tuls self-assigned this Mar 5, 2025

520 Fix tests menard.

1ee1012

johan-tuls mentioned this pull request Mar 6, 2025

#355 Added menard equations 2.21 and 2.22 of CUR 228 #356

Closed

6 tasks

GerjanDorgelo requested changes Mar 7, 2025

View reviewed changes

Merge branch 'main' into 520-feature-request-set-n-decimals-as-abstra…

b5e472e

…ct-method-to-latex-formula

Merge branch 'main' into 520-feature-request-set-n-decimals-as-abstra…

50fe742

…ct-method-to-latex-formula

egarciamendez added the in review This MR has been reviewed, and changes are made accordingly label Apr 21, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

520 feature request set n decimals as abstract method to latex formula #522

520 feature request set n decimals as abstract method to latex formula #522

Uh oh!

johan-tuls commented Mar 5, 2025

Uh oh!

github-actions bot commented Mar 5, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo Mar 7, 2025

Uh oh!

GerjanDorgelo commented Mar 7, 2025

Uh oh!

Uh oh!

520 feature request set n decimals as abstract method to latex formula #522

Are you sure you want to change the base?

520 feature request set n decimals as abstract method to latex formula #522

Uh oh!

Conversation

johan-tuls commented Mar 5, 2025

Description

Type of change

Checklist:

Uh oh!

github-actions bot commented Mar 5, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GerjanDorgelo commented Mar 7, 2025

Uh oh!

Uh oh!