Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add formula 6.5 for NEN-EN 1993-1-1_c2_a1_2016 including init files a… #120

Merged
merged 12 commits into from
Feb 7, 2024
Merged

Add formula 6.5 for NEN-EN 1993-1-1_c2_a1_2016 including init files a… #120

merged 12 commits into from
Feb 7, 2024

Conversation

Simone-de-Rijke
Copy link
Contributor

@Simone-de-Rijke Simone-de-Rijke commented Jan 24, 2024 •
edited
Loading

Description

Added formula file + init file accompanying it.
Added test files + init file accompanying it.

Fixes # 119

Type of change

  • New feature (non-breaking change which adds functionality)

Checklist:

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

@github-actions GitHub Actions
Copy link

Thank you so much for contributing to Blueprints! This is your Pull Request # 1 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!

@egarciamendez
Copy link
Member

Hi @Simone-de-Rijke , Great to see you opening a PR!

bro-wi
bro-wi reviewed Jan 25, 2024
View reviewed changes
Copy link
Contributor

@bro-wi bro-wi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Simone,

Great to see your contribution! The code is readable and also the docstrings are complete

I have some comments: some are stuff we have to discuss in the maintainers meeting but also some comments to keep the code consistent over the package.

Best regards,
Wichard

...codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/test_formula_6_5.py Outdated Show resolved Hide resolved
...ints/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/formula_6_5.py Outdated Show resolved Hide resolved
...codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/test_formula_6_5.py Outdated Show resolved Hide resolved
blueprints/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/__init__.py Show resolved Hide resolved
...ints/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/formula_6_5.py Show resolved Hide resolved
...ints/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/formula_6_5.py Show resolved Hide resolved
...ints/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/formula_6_5.py Outdated Show resolved Hide resolved
egarciamendez
egarciamendez requested changes Jan 25, 2024
View reviewed changes
Copy link
Member

@egarciamendez egarciamendez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice having you on board 😄
Couple of small changes needed to make it aligned with the other formulas. Check wichard's review.

@Simone-de-Rijke
Copy link
Contributor Author

Nice having you on board 😄 Couple of small changes needed to make it aligned with the other formulas. Check wichard's review.

The merging is still blocked based on this comment including a change request. Are more changes requested? If not, cloud you solve the requested change?

egarciamendez
egarciamendez approved these changes Feb 1, 2024
View reviewed changes
Copy link
Member

@egarciamendez egarciamendez left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything is fine 🚀

@Simone-de-Rijke
Copy link
Contributor Author

Simone-de-Rijke commented Feb 5, 2024 •
edited
Loading

Hi @bro-wi , Could you finish the review please?

bro-wi
bro-wi approved these changes Feb 5, 2024
View reviewed changes
Copy link
Contributor

@bro-wi bro-wi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to go!

@Simone-de-Rijke
Copy link
Contributor Author

Hi @egarciamendez , the merge should work automatically (according to the contribution guide (see text below)) however it doesn't seem to do so. Could you check it out?

image

@egarciamendez egarciamendez merged commit 04ffb85 into main Feb 7, 2024
4 checks passed
@egarciamendez egarciamendez deleted the 119-feature-request-add-formula-6.5-from-nen-en-1993-1-1+c2+a22016 branch February 7, 2024 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bro-wi bro-wi bro-wi approved these changes

@egarciamendez egarciamendez egarciamendez approved these changes

Assignees

@Simone-de-Rijke Simone-de-Rijke

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Simone-de-Rijke @egarciamendez @bro-wi