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.

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

refact: MixingRuleTypeInterface #1250

Merged
merged 4 commits into from
Jan 11, 2025

Conversation

asmfstatoil
Copy link
Collaborator

New Interface CPAMixingRuleType
Introduce SuperInterface MixingRuleTypeInterface for EosMixingRuleType and CPAMixingRuleType
Make mixingrule concept generic for phases, prepare for future cleaner split between types using eos mixing and cpa mixing

@asmfstatoil asmfstatoil requested a review from EvenSol as a code owner January 10, 2025 10:07
@asmfstatoil asmfstatoil force-pushed the ref_mixingrules branch 2 times, most recently from 2ba88a6 to 3dd93e6 Compare January 10, 2025 11:11
Copy link
Collaborator

@EvenSol EvenSol left a comment

Choose a reason for hiding this comment

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

Seems like a good update!. I suggest you update the expected results in the test so they will pass (seem all of they are just minor changes).

@codecov-commenter
Copy link

codecov-commenter commented Jan 11, 2025

Codecov Report

Attention: Patch coverage is 39.72603% with 88 lines in your changes missing coverage. Please review.

Project coverage is 41.15%. Comparing base (2180e83) to head (e558581).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
...va/neqsim/thermo/mixingrule/CPAMixingRuleType.java 0.00% 15 Missing ⚠️
...c/main/java/neqsim/thermo/system/SystemThermo.java 50.00% 7 Missing and 4 partials ⚠️
.../java/neqsim/thermo/mixingrule/CPAMixingRules.java 0.00% 10 Missing ⚠️
src/main/java/neqsim/thermo/phase/PhaseGE.java 25.00% 8 Missing and 1 partial ⚠️
src/main/java/neqsim/thermo/phase/PhaseEos.java 68.18% 4 Missing and 3 partials ⚠️
.../main/java/neqsim/process/equipment/tank/Tank.java 14.28% 6 Missing ⚠️
...process/equipment/pipeline/PipeBeggsAndBrills.java 54.54% 4 Missing and 1 partial ⚠️
...rc/main/java/neqsim/thermo/phase/PhaseDefault.java 0.00% 4 Missing ⚠️
...ava/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java 0.00% 4 Missing ⚠️
...rc/main/java/neqsim/thermo/phase/PhaseHydrate.java 0.00% 4 Missing ⚠️
... and 10 more
Additional details and impacted files
@@             Coverage Diff              @@
##             master    #1250      +/-   ##
============================================
- Coverage     41.17%   41.15%   -0.03%     
- Complexity     6025     6032       +7     
============================================
  Files           721      722       +1     
  Lines         68272    68331      +59     
  Branches       8153     8160       +7     
============================================
+ Hits          28113    28120       +7     
- Misses        38488    38532      +44     
- Partials       1671     1679       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@asmfstatoil asmfstatoil merged commit 0cf54fb into equinor:master Jan 11, 2025
5 checks passed
@asmfstatoil asmfstatoil deleted the ref_mixingrules branch January 11, 2025 08:37
@asmfstatoil
Copy link
Collaborator Author

Seems like a good update!. I suggest you update the expected results in the test so they will pass (seem all of they are just minor changes).

Found one more bug in my new code so after fixing that, there was no failing tests.

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.

3 participants