Skip to content

Allow loading of existing models in import_petab_problem#1383

Merged
dweindl merged 1 commit intodevelopfrom
lcontento-patch-1
Jan 28, 2021
Merged

Allow loading of existing models in import_petab_problem#1383
dweindl merged 1 commit intodevelopfrom
lcontento-patch-1

Conversation

@lcontento
Copy link
Contributor

import_petab_problem will fail if a model module has already been generated. This PR makes it possible.

Is there any reason why a pre-existent model should not be loaded when force_compile is false? If so then maybe we could add a keyword argument to only turn on this behaviour when needed.

@dweindl
Copy link
Member

dweindl commented Jan 28, 2021

Is there any reason why a pre-existent model should not be loaded

The only reason is that it's hard to ensure that an existing model matches the possibly changed petab.Problem. But that is independent of the proposed changes...

@dweindl
Copy link
Member

dweindl commented Jan 28, 2021

@ failing doxygen:

error: Problems running gs. Check your installation!

Not sure what's going on there again. Can be ignored here.

@codecov
Copy link

codecov bot commented Jan 28, 2021

Codecov Report

Merging #1383 (0ecf859) into develop (b113544) will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1383      +/-   ##
===========================================
- Coverage    78.80%   78.75%   -0.06%     
===========================================
  Files           63       63              
  Lines         9944     9920      -24     
===========================================
- Hits          7836     7812      -24     
  Misses        2108     2108              
Flag Coverage Δ
cpp 75.28% <ø> (-0.09%) ⬇️
petab 69.50% <ø> (ø)
python 68.09% <ø> (ø)

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

Impacted Files Coverage Δ
python/amici/petab_import.py 71.36% <ø> (ø)
src/sundials_matrix_wrapper.cpp 83.40% <0.00%> (-0.64%) ⬇️
src/vector.cpp 89.65% <0.00%> (+0.63%) ⬆️

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@dweindl dweindl merged commit 8d4b5b2 into develop Jan 28, 2021
@dweindl dweindl deleted the lcontento-patch-1 branch January 28, 2021 19:45
@dweindl dweindl mentioned this pull request Feb 19, 2021
dweindl added a commit that referenced this pull request Feb 20, 2021
….13)

Breaking changes:
* AMICI requires Python>=3.7
* Updated package installation (PEP517/518): 
  Creating source distributions requires https://github.com/pypa/build (#1384)
  (but now handles all package building dependencies properly)

Features:
* More flexible state reinitialization (#1417)

Updated dependencies:
* Upgrade to sundials 5.7.0 (#1392)

Fixes:
* Python: account for heaviside functions in expressions (#1382)
* Python: allow loading of existing models in import_petab_problem (#1383)
* Python: Don't override user-provided compiler/linker flags (#1389)
* Python: PEtab import reinitialization fixes (#1417)
* Python: Fix PEtab observables for pysb models (#1390)
* Python: Substitute expressions in event condition expressions (#1404)
* Python: Unspecified initial states in PEtab conditions table default to SBML initial value (#1397)
* C++: Fix timepoint out of bounds access (#1402)
* C++: Fix exported CMake config (#1388)
* Fixed Dockerfile: add python3-venv (#1398, #1408)

Other:
* Slim exported swig interface (#1425)
* Updated documentation
    * Getting started tutorial (#1423)
    * List supported SBML test tags (#1428)
    * Add AMICI C++/Python/Matlab feature comparison (#1409)
    * ...
* Various minor CI improvements
* ...
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