Refactor amici.ode_export, add AmiciCxxCodePrinter #1610
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dweindl
force-pushed
the
refactor_odeexport
branch
from
94afaef to
8095d96
Compare
Move custom codeprinting to a separate code printer class and reuse the same instance for all printing. Avoids plenty of reinstantiations of the code printer and keeps all settings in one place.
dweindl
force-pushed
the
refactor_odeexport
branch
from
8095d96 to
469c8cb
Compare
dweindl
changed the title
Codecov Report
@@ Coverage Diff @@
## develop #1610 +/- ##
===========================================
+ Coverage 78.76% 78.80% +0.04%
===========================================
Files 67 68 +1
Lines 10683 10666 -17
===========================================
- Hits 8414 8405 -9
+ Misses 2269 2261 -8
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
Kudos, SonarCloud Quality Gate passed! |
FFroehlich
approved these changes
Dec 6, 2021
| @@ -3114,7 +3027,7 @@ def _get_function_body(self, | |||
| f'reinitialization_state_idxs.cend(), {index}) != ' | |||
| 'reinitialization_state_idxs.cend())', | |||
| f' {function}[{index}] = ' | |||
| f'{_print_with_exception(formula)};' | |||
| f'{self.model._code_printer.doprint(formula)};' | |||
There was a problem hiding this comment.
wouldn't it make more sense to have _code_printer as member of the exporter?
There was a problem hiding this comment.
Fully agreed. The problem is that ODEModel also generates code (which I think should be changed, but maybe rather separately). Having it in ODEModel for now allows using it also in ODEExporter, but not vice versa.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move custom codeprinting to a separate code printer class and reuse the same instance for all printing.
Avoids plenty of reinstantiations of the code printer and keeps all settings in one place.