Skip to content

[com1] add option for resistance#1105

Merged
fso42 merged 3 commits into
masterfrom
addFT
Jun 3, 2025
Merged

[com1] add option for resistance#1105
fso42 merged 3 commits into
masterfrom
addFT

Conversation

@awirb
Copy link
Copy Markdown
Contributor

@awirb awirb commented Mar 12, 2025

This adds:

  • detrainment in resistance areas if v and th are below thresholds
  • disables resistance if v and th are above thresholds (thresholds are really high atm, should basically never apply; added for testting)

@awirb awirb requested a review from fso42 March 12, 2025 15:26
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py Outdated
@qlty-cloud-legacy
Copy link
Copy Markdown

Code Climate has analyzed commit f4fc025 and detected 13 issues on this pull request.

Here's the issue category breakdown:

Category Count
Complexity 1
Duplication 12

The test coverage on the diff in this pull request is 41.3% (50% is the threshold).

This pull request will bring the total coverage in the repository to 69.8% (-0.2% change).

View more on Code Climate.

@fso42 fso42 changed the title add option for resistance [com1] add option for resistance Apr 7, 2025
@fso42 fso42 added this to the Version 1.12 milestone Apr 7, 2025
@fso42 fso42 modified the milestones: Version 1.12, Version 1.12.1 Apr 24, 2025
@qltysh
Copy link
Copy Markdown
Contributor

qltysh Bot commented May 26, 2025

Diff Coverage: The code coverage on the diff in this pull request is 55.3%.

Total Coverage: This PR will decrease coverage by 0.12%.

File Coverage Changes
Path File Coverage Δ Indirect
avaframe/com1DFA/DFAfunctionsCython.pyx 0.5
avaframe/com1DFA/com1DFA.py -0.1
avaframe/com1DFA/com1DFATools.py -0.6
avaframe/out3Plot/outCom1DFA.py -4.1
🛟 Help
  • Diff Coverage: Coverage for added or modified lines of code (excludes deleted files). Learn more.

  • Total Coverage: Coverage for the whole repository, calculated as the sum of all File Coverage. Learn more.

  • File Coverage: Covered Lines divided by Covered Lines plus Missed Lines. (Excludes non-executable lines including blank lines and comments.)

    • Indirect Changes: Changes to File Coverage for files that were not modified in this PR. Learn more.

@awirb awirb requested a review from PaulaSp3 May 27, 2025 12:39
@qltysh
Copy link
Copy Markdown
Contributor

qltysh Bot commented May 27, 2025

1 new issue

Tool Category Rule Count
qlty Structure Function with high complexity (count = 11): computeEulerTimeStep 1

Comment thread avaframe/com1DFA/com1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFA.py Outdated
Comment thread avaframe/out3Plot/outCom1DFA.py
Comment thread avaframe/com1DFA/com1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFA.py Outdated
Copy link
Copy Markdown
Contributor

@fso42 fso42 left a comment

Choose a reason for hiding this comment

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

  • Change snow slide res parameter
  • Apply qtly suggestions about is not None
  • fix pytest error

Comment thread avaframe/com1DFA/com1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFA.py
Comment thread avaframe/com1DFA/com1DFA.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/com1DFA/com1DFATools.py Outdated
Comment thread avaframe/com1DFA/deriveParameterSet.py Outdated
Copy link
Copy Markdown
Contributor

@PaulaSp3 PaulaSp3 left a comment

Choose a reason for hiding this comment

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

I've only tested the changes with doing a few test runs.
@fso42 and @awirb, if I also should check the code, please tell me.

@awirb awirb requested a review from fso42 June 2, 2025 08:36
Comment thread avaframe/tests/test_com1DFATools.py Outdated
Comment thread avaframe/tests/test_com1DFATools.py Outdated
Comment thread avaframe/com1DFA/com1DFA.py
Comment thread avaframe/out1Peak/outPlotAllPeak.py
Comment thread avaframe/out1Peak/outPlotAllPeak.py
Comment thread avaframe/out3Plot/outCom1DFA.py
Comment thread avaframe/tests/test_DFAfunctionsCython.py
Comment thread avaframe/tests/test_DFAfunctionsCython.py
Comment thread avaframe/tests/test_com1DFATools.py
Comment thread avaframe/tests/test_com1DFATools.py
@fso42 fso42 modified the milestones: Version 1.12.1, Version 1.13 Jun 2, 2025
@fso42 fso42 assigned fso42 and unassigned awirb Jun 2, 2025
@fso42
Copy link
Copy Markdown
Contributor

fso42 commented Jun 2, 2025

Standardtests ident apart from the res ones:
big changes on avaInclinedPlane and avaParabola (especially the mass)
minimal change on avaHof

Benchmark results will be updated with 1.13.1

@fso42 fso42 merged commit a5e5e72 into master Jun 3, 2025
7 checks passed
@fso42 fso42 deleted the addFT branch June 3, 2025 07:15
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