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

User-calibrated models #87

Merged
merged 32 commits into from
Nov 11, 2024
Merged

User-calibrated models #87

merged 32 commits into from
Nov 11, 2024

Conversation

dilpath
Copy link
Member

@dilpath dilpath commented Mar 27, 2024

Allow users to supply previously-calibrated models. Model selection should proceed as if the user did not provide any calibrated models. However, whenever a user-calibrated model is encountered during model selection, that model is not sent to the calibration tool. Instead, the user-calibrated model is included after the calibration tools returns its results.

This introduces a new workflow: instead of iterations of petab_select.ui.candidates, tools must now use iterations of petab_select.ui.start_iteration and petab_select.ui.end_iteration.

@dilpath dilpath changed the base branch from develop to model_hashes_nicer March 29, 2024 10:29
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 24.00000% with 19 lines in your changes are missing coverage. Please review.

Project coverage is 57.35%. Comparing base (9ab8a23) to head (1777019).

Files Patch % Lines
petab_select/ui.py 11.76% 15 Missing ⚠️
petab_select/candidate_space.py 50.00% 4 Missing ⚠️
Additional details and impacted files
@@                  Coverage Diff                   @@
##           model_hashes_nicer      #87      +/-   ##
======================================================
- Coverage               57.85%   57.35%   -0.50%     
======================================================
  Files                      14       14              
  Lines                    1554     1578      +24     
======================================================
+ Hits                      899      905       +6     
- Misses                    655      673      +18     

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

Base automatically changed from model_hashes_nicer to develop October 6, 2024 19:13
@dilpath dilpath mentioned this pull request Oct 15, 2024
@dilpath dilpath force-pushed the user_calibrated_models branch from 6951e8b to c3ca938 Compare November 11, 2024 19:48
@dilpath dilpath force-pushed the user_calibrated_models branch from 7e5a720 to e166f62 Compare November 11, 2024 20:37
@dilpath dilpath merged commit ad5a02c into develop Nov 11, 2024
2 of 3 checks passed
@dilpath dilpath deleted the user_calibrated_models branch November 11, 2024 21:39
dilpath added a commit that referenced this pull request Nov 18, 2024
* make model hashes nicer; add model hash to model method

* :class:`ModelHash`

* support user-supplied models with no specified subspace

* Skip virtual models in `models_to_yaml_list` (#66)

* Action updates via dependabot (#92)

* GHA: Add PyPI deployment workflow (#91)

Related to #89

* Fix minimum Python requirement (#97)

petab requires python>=3.10

* Doc: Fix heading levels in example (#96)



Fixes the sphinx TOC and a typo.

* Get rid of petab DeprecationWarnings (#93)

Closes #90

* README.md: PyPI badge

* Add some docs; ensure similar PEtab problems in distance calculation (#67)

* File formats to RTD (#102)

* Move test suite description to RTD (#101)

Related to #95.

* User-calibrated models (#87)

* compute safe petab hash digest size; support custom digest size; refactor `CandidateSpace` excluded hashes; add `end_iteration`; rename `candidates`->`start_iteration`; change workflow as described in changelog

* `ModelHash.__eq__`: support comparisons with `str` and partial hashes

* repro: narrow bounds in test cases 1-8

* Add logo draft (#103)

* add to RTD, closes #88

* Set up `setuptools_scm` (#100)

Set up `setuptools_scm` and move most package configuration to `pyproject.toml`.

Move git-based package URLs out of `pyproject.toml` (otherwise, PyPI upload will fail).


Co-authored-by: Dilan Pathirana <[email protected]>

* Doc: Update RTD landing page (#105)

* Doc: Update RTD landing page

Add a bit of content. #95.

* Apply suggestions from code review

Co-authored-by: Dilan Pathirana <[email protected]>

* Formatting, spelling, links

---------

Co-authored-by: Dilan Pathirana <[email protected]>

* Switch from black/isort/... to ruff (#99)

Replace black/isort/... by ruff. Run `pre-commit run --all-files`.

Some additional rules should be enabled, but that will require additional effort.


---------

Co-authored-by: Dilan Pathirana <[email protected]>

* Update file format spec (#106)

* add example to model space, to clarify compressed format

Co-authored-by: Daniel Weindl <[email protected]>

* Doc: fix list formatting (#107)

* test case 0009: update predecessor model

* Visualization methods (#36)

* closes #104

---------

Co-authored-by: Daniel Weindl <[email protected]>
Co-authored-by: Daniel Weindl <[email protected]>

* Support SSR as criterion (#108)

* closes #44

* changelog

---------

Co-authored-by: Dilan Pathirana <[email protected]>
Co-authored-by: Daniel Weindl <[email protected]>
Co-authored-by: Daniel Weindl <[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.

2 participants