search

AMICI-dev / AMICI

Advanced Multilanguage Interface to CVODES and IDAS
https://amici.readthedocs.io/
Other
108 stars 30 forks source link

Get rid of amici.swig_wrappers.ExpData #2396

Closed dweindl closed 5 months ago

dweindl commented 5 months ago

Move the amici.swig_wrappers.ExpData logic into the swig-generated ExpData. This avoids shading the ExpData class by amici.swig_wrappers.ExpData. The old implementation prevented using e.g. isinstance(x, amici.ExpData).

This required also:

Closes #2380

codecov[bot] commented 5 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 77.60%. Comparing base (e8493cf) to head (7e7c3d7).

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396/graphs/tree.svg?width=650&height=150&src=pr&token=1bt9lbspzk&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev)](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) ```diff @@ Coverage Diff @@ ## develop #2396 +/- ## =========================================== - Coverage 77.61% 77.60% -0.02% =========================================== Files 324 324 Lines 20895 20876 -19 Branches 1458 1458 =========================================== - Hits 16218 16200 -18 + Misses 4674 4673 -1 Partials 3 3 ``` | [Flag](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) | Coverage Δ | | |---|---|---| | [cpp](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) | `73.36% <ø> (-0.02%)` | :arrow_down: | | [cpp_python](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) | `34.15% <ø> (-0.05%)` | :arrow_down: | | [petab](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) | `36.73% <ø> (-0.06%)` | :arrow_down: | | [python](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) | `72.14% <ø> (-0.03%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev#carryforward-flags-in-the-pull-request-comment) to find out more. | [Files](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev) | Coverage Δ | | |---|---|---| | [python/sdist/amici/\_\_init\_\_.py](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396?src=pr&el=tree&filepath=python%2Fsdist%2Famici%2F__init__.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev#diff-cHl0aG9uL3NkaXN0L2FtaWNpL19faW5pdF9fLnB5) | `94.44% <ø> (ø)` | | | [python/sdist/amici/swig\_wrappers.py](https://app.codecov.io/gh/AMICI-dev/AMICI/pull/2396?src=pr&el=tree&filepath=python%2Fsdist%2Famici%2Fswig_wrappers.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AMICI-dev#diff-cHl0aG9uL3NkaXN0L2FtaWNpL3N3aWdfd3JhcHBlcnMucHk=) | `92.42% <ø> (-0.52%)` | :arrow_down: |