Skip to content

Refactor(C++): Extract SimulationParameters from Model and ExpData#1407

Merged
dweindl merged 6 commits intodevelopfrom
refactor_931_simulation_parameters
Feb 11, 2021
Merged

Refactor(C++): Extract SimulationParameters from Model and ExpData#1407
dweindl merged 6 commits intodevelopfrom
refactor_931_simulation_parameters

Conversation

@dweindl
Copy link
Member

@dweindl dweindl commented Feb 10, 2021

This allows using Model without ExpData unless there really are measurements. Also avoids having to add any new member of ExpData also to Model and slims down Model a bit. Getters and setters for SimulationParameters members are still in Model, which is to preserve backwards compatibility for ExpData, which allowed unchecked access to the respective members. Further refactoring to follow.

Partially addresses #931 (moving ID / name functions is still missing).

@codecov
Copy link

codecov bot commented Feb 10, 2021

Codecov Report

Merging #1407 (5fa46d2) into develop (0a85246) will increase coverage by 0.12%.
The diff coverage is 98.92%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1407      +/-   ##
===========================================
+ Coverage    78.70%   78.82%   +0.12%     
===========================================
  Files           63       65       +2     
  Lines        10008    10061      +53     
===========================================
+ Hits          7877     7931      +54     
+ Misses        2131     2130       -1     
Flag Coverage Δ
cpp 75.43% <98.92%> (+0.20%) ⬆️
petab 69.48% <ø> (ø)
python 67.72% <ø> (ø)

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

Impacted Files Coverage Δ
include/amici/edata.h 0.00% <ø> (ø)
include/amici/model.h 70.83% <ø> (ø)
include/amici/model_dae.h 0.00% <ø> (ø)
include/amici/simulation_parameters.h 66.66% <66.66%> (ø)
src/edata.cpp 88.28% <100.00%> (+0.04%) ⬆️
src/model.cpp 84.23% <100.00%> (+0.27%) ⬆️
src/simulation_parameters.cpp 100.00% <100.00%> (ø)
src/exception.cpp 82.60% <0.00%> (-8.70%) ⬇️
src/vector.cpp 89.02% <0.00%> (-0.64%) ⬇️
src/solver_cvodes.cpp 70.20% <0.00%> (-0.21%) ⬇️
... and 4 more

@dweindl dweindl marked this pull request as ready for review February 10, 2021 22:20
@dweindl dweindl requested a review from FFroehlich February 10, 2021 22:20
@sonarqubecloud
Copy link

Copy link
Member

@FFroehlich FFroehlich left a comment

Choose a reason for hiding this comment

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

👍

@dweindl dweindl merged commit ff13ea2 into develop Feb 11, 2021
@dweindl dweindl deleted the refactor_931_simulation_parameters branch February 11, 2021 16:46
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