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

Demographic model recombination rate #1591

Open
wants to merge 12 commits into
base: main
Choose a base branch
from

Conversation

gregorgorjanc
Copy link
Contributor

Here is implementation for #1225.

I get almost all tests passing on my end:

  • had to change np.NINF to -np.inf (new numpy)
  • TestRegisterQCDFE.test_register_qc seems to have deep recursion, but that is not due to my changes (I think)
============================================================================== FAILURES ==============================================================================
_________________________________________________________________ TestRegisterQCDFE.test_register_qc _________________________________________________________________
[gw2] darwin -- Python 3.12.7 /opt/homebrew/Caskroom/miniconda/base/envs/popsim/bin/python

self = <tests.test_dfes.TestRegisterQCDFE object at 0x1094932f0>

    def test_register_qc(self):
        dfe = self.make_dfe("test")
        dfe.register_qc(dfe)
>       assert dfe.qc_dfe == dfe

tests/test_dfes.py:720:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
<attrs generated eq stdpopsim.dfe.DFE>:11: in __eq__
    self.qc_dfe == other.qc_dfe
<attrs generated eq stdpopsim.dfe.DFE>:11: in __eq__
    self.qc_dfe == other.qc_dfe
E   RecursionError: maximum recursion depth exceeded
!!! Recursion detected (same locals & position)
====================================================================== short test summary info =======================================================================
FAILED tests/test_dfes.py::TestRegisterQCDFE::test_register_qc - RecursionError: maximum recursion depth exceeded
==================================================================== 1 failed, 56 passed in 1.02s ====================================================================

Copy link

codecov bot commented Nov 9, 2024

Codecov Report

Attention: Patch coverage is 92.30769% with 3 lines in your changes missing coverage. Please review.

Project coverage is 99.74%. Comparing base (0d91be4) to head (7687ed7).

Files with missing lines Patch % Lines
stdpopsim/cli.py 66.66% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1591      +/-   ##
==========================================
- Coverage   99.81%   99.74%   -0.07%     
==========================================
  Files         130      130              
  Lines        4354     4376      +22     
  Branches      597      603       +6     
==========================================
+ Hits         4346     4365      +19     
- Misses          3        5       +2     
- Partials        5        6       +1     
Flag Coverage Δ
?

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

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

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.

1 participant