Skip to content

Commit f51bb60

Browse files
authored
refactor: 0-based indexing in Model::z2event_ (#2964)
Get rid of 1-based event-indexing in `Model::z2event_` from ancient MATLAB times. Related to #2727.
1 parent d5492c3 commit f51bb60

File tree

183 files changed

+84
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+84
-540
lines changed

models/model_calvetti_py/Jy.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#include "amici/symbolic_functions.h"
22
#include "amici/defines.h"
3-
#include "sundials/sundials_types.h"
43

5-
#include <gsl/gsl-lite.hpp>
64
#include <algorithm>
7-
85
#include "k.h"
96
#include "y.h"
107
#include "sigmay.h"

models/model_calvetti_py/create_splines.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#include "amici/symbolic_functions.h"
22
#include "amici/defines.h"
3-
#include "sundials/sundials_types.h"
43

5-
#include <gsl/gsl-lite.hpp>
64
#include <algorithm>
7-
85
#include "amici/splinefunctions.h"
96
#include <vector>
107
#include "k.h"

models/model_calvetti_py/dJydsigma.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#include "amici/symbolic_functions.h"
22
#include "amici/defines.h"
3-
#include "sundials/sundials_types.h"
43

5-
#include <gsl/gsl-lite.hpp>
64
#include <algorithm>
7-
85
#include "k.h"
96
#include "y.h"
107
#include "sigmay.h"

models/model_calvetti_py/dJydy.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ void dJydy_rowvals_model_calvetti_py(SUNMatrixWrapper &dJydy, int index){
5151

5252
#include "amici/symbolic_functions.h"
5353
#include "amici/defines.h"
54-
#include "sundials/sundials_types.h"
5554

56-
#include <gsl/gsl-lite.hpp>
5755
#include <algorithm>
58-
56+
#include <sundials/sundials_types.h>
57+
#include <gsl/gsl-lite.hpp>
5958
#include "k.h"
6059
#include "y.h"
6160
#include "sigmay.h"

models/model_calvetti_py/dwdw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ void dwdw_rowvals_model_calvetti_py(SUNMatrixWrapper &dwdw){
4141

4242
#include "amici/symbolic_functions.h"
4343
#include "amici/defines.h"
44-
#include "sundials/sundials_types.h"
4544

46-
#include <gsl/gsl-lite.hpp>
4745
#include <algorithm>
48-
46+
#include <sundials/sundials_types.h>
47+
#include <gsl/gsl-lite.hpp>
4948
#include "x.h"
5049
#include "k.h"
5150
#include "h.h"

models/model_calvetti_py/dwdx.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ void dwdx_rowvals_model_calvetti_py(SUNMatrixWrapper &dwdx){
4141

4242
#include "amici/symbolic_functions.h"
4343
#include "amici/defines.h"
44-
#include "sundials/sundials_types.h"
4544

46-
#include <gsl/gsl-lite.hpp>
4745
#include <algorithm>
48-
46+
#include <sundials/sundials_types.h>
47+
#include <gsl/gsl-lite.hpp>
4948
#include "x.h"
5049
#include "k.h"
5150
#include "h.h"

models/model_calvetti_py/dxdotdw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ void dxdotdw_rowvals_model_calvetti_py(SUNMatrixWrapper &dxdotdw){
4141

4242
#include "amici/symbolic_functions.h"
4343
#include "amici/defines.h"
44-
#include "sundials/sundials_types.h"
4544

46-
#include <gsl/gsl-lite.hpp>
4745
#include <algorithm>
48-
46+
#include <sundials/sundials_types.h>
47+
#include <gsl/gsl-lite.hpp>
4948
#include "x.h"
5049
#include "k.h"
5150
#include "h.h"

models/model_calvetti_py/dxdotdx_explicit.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ void dxdotdx_explicit_rowvals_model_calvetti_py(SUNMatrixWrapper &dxdotdx_explic
4141

4242
#include "amici/symbolic_functions.h"
4343
#include "amici/defines.h"
44-
#include "sundials/sundials_types.h"
4544

46-
#include <gsl/gsl-lite.hpp>
4745
#include <algorithm>
48-
46+
#include <sundials/sundials_types.h>
47+
#include <gsl/gsl-lite.hpp>
4948
#include "x.h"
5049
#include "k.h"
5150
#include "h.h"

models/model_calvetti_py/dydx.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#include "amici/symbolic_functions.h"
22
#include "amici/defines.h"
3-
#include "sundials/sundials_types.h"
43

5-
#include <gsl/gsl-lite.hpp>
64
#include <algorithm>
7-
85
#include "x.h"
96
#include "k.h"
107
#include "h.h"

models/model_calvetti_py/explicit_roots.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#include "amici/symbolic_functions.h"
22
#include "amici/defines.h"
3-
#include "sundials/sundials_types.h"
43

5-
#include <gsl/gsl-lite.hpp>
64
#include <algorithm>
7-
85
#include <vector>
96
#include "k.h"
107

0 commit comments

Comments
 (0)