Skip to content

Update TiGL to work with cpacs_tigl_gen Update #1083

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.

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

Merged
merged 34 commits into from
Jul 15, 2025
Merged

Conversation

merakulix
Copy link
Contributor

@merakulix merakulix commented May 7, 2025

TiGL is now up to date with the updates made in cpacs_tigl_gen that close Issue59 from RISCSoftware/cpacs_tigl_gen.

Description

The generator was updated to generate consistent getter functions for all CPACS Elements with Attribute: maxOccur = "unbounded".

This PR fixes conflicts that occured due to the changes.

Fixes Issue59 from RISCSoftware/cpacs_tigl_gen.

How Has This Been Tested?

Checklist:

Task Finished Reviewer Approved
At least one test for the new functionality was added.
  • yes
  • does not apply
  • OK
New classes have been added to the Python interface.
  • yes
  • does not apply
  • OK
The code is properly documented with doxygen docstrings
  • yes
  • does not apply
  • OK
Changes are documented at the top of ChangeLog.md
  • yes
  • does not apply
  • OK

Copy link

codecov bot commented May 7, 2025

Codecov Report

Attention: Patch coverage is 68.75000% with 75 lines in your changes missing coverage. Please review.

Project coverage is 69.91%. Comparing base (451b331) to head (5501e4c).

Files with missing lines Patch % Lines
src/configuration/CCPACSConfiguration.cpp 57.77% 38 Missing ⚠️
src/rotor/CCPACSRotorHinge.cpp 0.00% 10 Missing ⚠️
src/rotor/CCPACSRotor.cpp 50.00% 6 Missing ⚠️
src/rotor/CCPACSRotorBladeAttachments.cpp 14.28% 6 Missing ⚠️
src/rotor/CCPACSRotorBladeAttachment.cpp 70.58% 5 Missing ⚠️
src/fuselage/CCPACSFuselageProfiles.cpp 55.55% 4 Missing ⚠️
src/fuselage/CTiglFuselageConnection.cpp 95.94% 3 Missing ⚠️
src/rotor/CCPACSRotorBlades.cpp 33.33% 2 Missing ⚠️
src/exports/CTiglCADExporter.cpp 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1083      +/-   ##
==========================================
- Coverage   70.13%   69.91%   -0.23%     
==========================================
  Files         307      294      -13     
  Lines       27601    27285     -316     
==========================================
- Hits        19358    19075     -283     
+ Misses       8243     8210      -33     
Flag Coverage Δ
unittests 69.91% <68.75%> (-0.23%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
src/CCPACSPositionings.cpp 95.23% <ø> (-0.48%) ⬇️
src/api/tigl.cpp 51.90% <ø> (ø)
src/fuelTanks/CCPACSVessel.cpp 99.75% <100.00%> (+<0.01%) ⬆️
src/fuselage/CCPACSFrame.cpp 48.55% <ø> (ø)
src/fuselage/CCPACSFuselage.cpp 66.51% <100.00%> (ø)
src/fuselage/CCPACSFuselage.h 100.00% <ø> (ø)
src/fuselage/CCPACSFuselageSectionElement.cpp 17.39% <ø> (ø)
src/fuselage/CCPACSFuselageSegment.cpp 64.03% <ø> (ø)
src/fuselage/CCPACSFuselageSegments.cpp 79.01% <ø> (-3.10%) ⬇️
src/geometry/CCPACSGenericSystems.cpp 100.00% <ø> (+9.52%) ⬆️
... and 11 more

... and 15 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@MarAlder
Copy link
Collaborator

MarAlder commented May 8, 2025

Nice to see that CPACSGen is improved, thanks :) Just a small comment from my side: In the update_code_gen branch, the thirdparty submodule still links against 6f4fc1b, which is the 2-year old version, right?

@joergbrech
Copy link
Contributor

Nice to see that CPACSGen is improved, thanks :) Just a small comment from my side: In the update_code_gen branch, the thirdparty submodule still links against 6f4fc1b, which is the 2-year old version, right?

I suggest setting it to the merge commit of the PR RISCSoftware/cpacs_tigl_gen#61, once merged.

@joergbrech
Copy link
Contributor

@merakulix, can we update this branch now that #1058 has been merged? This PR includes an update to the schema as well as some affected CPACS classes, see #1058 (comment).

@joergbrech
Copy link
Contributor

@merakulix, could you please

  1. Resolve the conflict and update this branch to the latest changes in master. Note that the environment.yml should not be modified, it has recently been fixed on the master branch
  2. Properly update the git submodule. Currently, the submodule is not functional. If you navigate to it on Github you get a 404.

Then I will have another quick look, but then we should have it 💪 Thanks!

@merakulix merakulix changed the title Update TiGL to working with cpacs_tigl_gen Update Update TiGL to work with cpacs_tigl_gen Update Jul 10, 2025
@merakulix
Copy link
Contributor Author

Resolved all conflicts with the tanks update. Updated function names and ran python tests for fuel tanks again. Adjusted Python config file. All tests run successfully.

@merakulix merakulix marked this pull request as ready for review July 14, 2025 14:50
@joergbrech
Copy link
Contributor

Awesome! The drop in code coverage is expected, because the generated code is excluded from the metric and the ratio of generated code increases with this PR.

@joergbrech joergbrech merged commit 82bdf2c into master Jul 15, 2025
30 of 32 checks passed
@joergbrech joergbrech deleted the update_code_gen branch July 15, 2025 11:40
merakulix added a commit that referenced this pull request Jul 24, 2025
This fixes an error that occurred in PR #1083. When updating the getter functions regarding const correctness, the decrement by 1 of the index was lost.
merakulix added a commit that referenced this pull request Jul 24, 2025
This fixes an error that occurred in PR #1083. When updating the getter functions regarding const correctness, the decrement by 1 of the index was lost. Calling the base class getter functions fixes this, and reduces duplicate code.
merakulix added a commit that referenced this pull request Jul 28, 2025
This fixes an error that occurred in PR #1083. When updating the getter functions regarding const correctness, the decrement by 1 of the index was lost. Calling the base class getter functions fixes this, and reduces duplicate code.

Co-authored-by: merakulix <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Getters and Setters for the elements of sequences
3 participants