Fix substitution of expressions in root and stau #1784

dilpath · 2022-04-21T09:47:50Z

Caused an error like the following for a model

famos_cd4_root.cpp: In function ‘void amici::model_famos_cd4::root_famos_cd4(amici::realtype*, amici::realtype, const realtype*, const realtype*, const realtype*, const realtype*, const realtype*)’:
famos_cd4_root.cpp:17:15: error: ‘scaling_con_tau’ was not declared in this scope; did you mean ‘scaling_para_tau’?
   17 |     root[0] = scaling_con_tau*scaling_para_tau*tau - t;
      |               ^~~~~~~~~~~~~~~
      |               scaling_para_tau

famos_cd4_stau.cpp: In function ‘void amici::model_famos_cd4::stau_famos_cd4(amici::realtype*, amici::realtype, const realtype*, const realtype*, const realtype*, const realtype*, const realtype*, const realtype*, int, int)’:
famos_cd4_stau.cpp:22:31: error: ‘scaling_con_tau’ was not declared in this scope; did you mean ‘scaling_para_tau’?
   22 |                     stau[0] = scaling_con_tau*scaling_para_tau;
      |                               ^~~~~~~~~~~~~~~
      |                               scaling_para_tau
famos_cd4_stau.cpp:32:31: error: ‘scaling_con_tau’ was not declared in this scope; did you mean ‘scaling_para_tau’?
   32 |                     stau[0] = scaling_con_tau*scaling_para_tau;
      |                               ^~~~~~~~~~~~~~~
      |                               scaling_para_tau

codecov · 2022-04-21T09:59:37Z

Codecov Report

Merging #1784 (a168150) into develop (b951f39) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop    #1784      +/-   ##
===========================================
+ Coverage    78.07%   78.11%   +0.04%     
===========================================
  Files           74       74              
  Lines        12154    12154              
===========================================
+ Hits          9489     9494       +5     
+ Misses        2665     2660       -5

Flag	Coverage Δ
cpp	`75.09% <ø> (+0.06%)`	⬆️
petab	`60.76% <100.00%> (+0.04%)`	⬆️
python	`68.37% <100.00%> (ø)`
sbmlsuite	`86.67% <100.00%> (ø)`

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

Impacted Files	Coverage Δ
python/amici/ode_export.py	`92.48% <100.00%> (ø)`
src/solver_cvodes.cpp	`70.43% <0.00%> (+0.16%)`	⬆️
src/sundials_matrix_wrapper.cpp	`80.53% <0.00%> (+0.44%)`	⬆️
src/exception.cpp	`81.08% <0.00%> (+5.40%)`	⬆️