Fix extraction of common subexpressions #1865

dweindl · 2022-09-10T09:18:58Z

Got broken in #1859 (cc5f7cc#diff-44c38f8a81d42beabd5ab6dfd5db9a33bda06ded71f7cbfa5a47a7a1b8fd824eL3028), so that AMICI_EXTRACT_CSE=1 had no effect.

That change also broke the use of human-readable lhs symbols in generated code. Also fixed here.

Added tests for both.

Got broken #1859 (cc5f7cc#diff-44c38f8a81d42beabd5ab6dfd5db9a33bda06ded71f7cbfa5a47a7a1b8fd824eL3028), so that `AMICI_EXTRACT_CSE=1` had no effect. That change also broke the use of human-readable lhs symbols in generated code. Also fixed here. Added tests for both.

codecov · 2022-09-10T09:41:56Z

Codecov Report

Merging #1865 (08ec280) into develop (b93e2ce) will increase coverage by 0.25%.
The diff coverage is 100.00%.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1865      +/-   ##
===========================================
+ Coverage    76.12%   76.38%   +0.25%     
===========================================
  Files           74       74              
  Lines        12863    12868       +5     
===========================================
+ Hits          9792     9829      +37     
+ Misses        3071     3039      -32

Flag	Coverage Δ
cpp	`72.81% <ø> (ø)`
petab	`59.08% <71.42%> (+0.15%)`	⬆️
python	`69.32% <100.00%> (+0.76%)`	⬆️
sbmlsuite	`86.71% <100.00%> (+0.04%)`	⬆️

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

Impacted Files	Coverage Δ
python/amici/cxxcodeprinter.py	`89.53% <100.00%> (+22.09%)`	⬆️
python/amici/ode_export.py	`91.91% <100.00%> (+0.04%)`	⬆️
src/sundials_matrix_wrapper.cpp	`80.61% <0.00%> (ø)`
python/amici/gradient_check.py	`96.84% <0.00%> (+13.68%)`	⬆️