Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it possible to interpret a model (initially algebraic and ODE models) #1220

Open
wants to merge 155 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
99672cd
Interpreter: skeleton code.
agarny Apr 7, 2024
d6f5b87
Interpreter: added some (empty) methods to compute a model.
agarny Apr 8, 2024
b67ea7d
Interpreter: added methods to retrieve the VOI, states, rates, and va…
agarny Apr 8, 2024
7f97aa4
Interpreter: allocate the different arrays.
agarny Apr 8, 2024
412d8d4
Merge branch 'main' into issue1218.
agarny Apr 8, 2024
0488b1b
Interpreter tests: make sure that all our arrays are initialised with…
agarny Apr 9, 2024
c3690ea
Some minor cleaning up.
agarny Apr 9, 2024
3d6552b
Interpreter: added the skeleton of the InterpreterInstruction class.
agarny Apr 9, 2024
d93b7d8
Interpreter: added the skeleton of a GeneratorInterpreter class.
agarny Apr 9, 2024
907da52
Generator: extracted the code that generates the code to compute the …
agarny Apr 9, 2024
5412941
Tests: simplified the use of some arrays.
agarny Apr 10, 2024
d9e4258
Interpreter: simplified the construction of our arrays.
agarny Apr 10, 2024
a9914f6
Interpreter: can evaluate generateZeroInitialisationCode().
agarny Apr 11, 2024
d408b5f
Renamed interpreterinstruction[_p].[cpp|h] to interpreterstatement[_p…
agarny Apr 11, 2024
09fe513
Renamed the InterpreterInstruction class to InterpreterStatement.
agarny Apr 11, 2024
38b608a
Address coverage issues.
agarny Apr 11, 2024
4dbd96d
Interpreter: some minor cleaning up.
agarny Apr 11, 2024
ac65d8a
InterpreterStatement: reworked its create() methods.
agarny Apr 11, 2024
32eedd1
GeneratorInterpreter: merged generateDoubleOrConstantVariableNameCode…
agarny Apr 11, 2024
db0665f
GeneratorProfile: don't define the min() and max() functions for the …
agarny Apr 16, 2024
d959235
GeneratorProfile: use the M_E constant rather than exp(1.0).
agarny Apr 16, 2024
9a96766
Interpreter: can evaluate generateInitialisationCode().
agarny Apr 11, 2024
cab734a
Interpreter: can evaluate generateEquationCode().
agarny Apr 15, 2024
9341694
Debug: print an InterpreterStatement object as a tree.
agarny Apr 16, 2024
52219db
InterpreterStatement: keep track of calls to externalVariable().
agarny Apr 16, 2024
4a6c420
Generator/Interpreter: improved our tracking of rates.
agarny Apr 17, 2024
fb67039
Debug: some minor improvements to the printing of an AST / Interprete…
agarny Apr 16, 2024
743b33e
InterpreterStatement: temporarily disable some code to get full code …
agarny Apr 17, 2024
c0e0525
InterpreterStatement: re-enable some code.
agarny Apr 17, 2024
b38dc48
Debug: make it easier to check the name of CI elements when printing …
agarny Apr 17, 2024
f01ef9d
GeneratorInterpreter: have InterpreterStatement track piecewise state…
agarny Apr 17, 2024
07b99d2
AnalyserVariable: removed an unneeded class member.
agarny Apr 17, 2024
a08fec0
Debug: improved the printing of an AST as a tree.
agarny Apr 17, 2024
34ab752
CMake: give our utilities access to libxml2.
agarny Apr 17, 2024
c139ced
Windows: added a header file that is needed on Windows.
agarny Apr 17, 2024
2a9415e
Linux: prevent clashes with the TRUE and FALSE macros.
agarny Apr 17, 2024
c3c8c45
CMake: account for debug.cpp and debug.h in the format_code target.
agarny Apr 17, 2024
03607ef
Debug: refactoring of code.
agarny Apr 17, 2024
1204fb1
InterpreterStatement: temporarily disable some code to get full code …
agarny Apr 17, 2024
a97ac29
Coverage: removed unneeded tests.
agarny Apr 17, 2024
e0f1dbc
Coverage: make sure that we have full coverage in InterpreterStatement.
agarny Apr 17, 2024
9373065
InterpreterStatement: removed the DIFF type.
agarny Apr 18, 2024
0b31297
InterpreterStatement: re-enabled the evaluation of some types.
agarny Apr 18, 2024
7d48ea0
InterpreterStatement: added the evaluation of trigonometric functions.
agarny Apr 18, 2024
b6aa691
GeneratorProfile: simplified the definition of some trigonometric fun…
agarny Apr 18, 2024
9460678
Analyser: allow a `piecewise` element to have no children or only an …
agarny Apr 18, 2024
290beda
InterpreterStatement: don't need the `OTHERWISE` type.
agarny Apr 18, 2024
3f0be73
GeneratorInterpreter: the default profile doesn't have an `XOR` opera…
agarny Apr 18, 2024
3c3df21
InterpreterStatement: can now evaluate a piecewise statement.
agarny Apr 18, 2024
532efc1
Interpreter: allow the evaluation of computeComputedConstants().
agarny Apr 18, 2024
5cd4a41
Utils: moved areNearlyEqual() to src/commonutils.cpp.
agarny Apr 18, 2024
3126a0e
Linux: added a needed header file.
agarny Apr 18, 2024
f835aa5
Interpreter: added support for VOI.
agarny Apr 19, 2024
1148d08
InterpreterStatement: renamed/improved some types
agarny Apr 19, 2024
8077ffa
Analyser: improved code readability.
agarny Apr 19, 2024
6bbb036
Tests: updated the expected values from our InterpreterStatement class.
agarny Apr 18, 2024
a94e396
Interpreter: enable the computation of rates.
agarny Apr 19, 2024
6614251
Interpreter: enable the computation of variables.
agarny Apr 19, 2024
ce7570f
InterpreterStatement: cache a variable's index.
agarny Apr 19, 2024
62dd985
Linux: added the header file for memcpy().
agarny Apr 19, 2024
262608e
Tests: updated our bindings tests for the interpreter.
agarny Apr 19, 2024
53e262a
Linux: added a needed header file for math functions.
agarny Apr 19, 2024
dc51437
InterpreterStatement: use the ternary operator to evaluate a piecewis…
agarny Apr 21, 2024
63f8333
Interpreter: return the states, rates, and variables by reference.
agarny Apr 21, 2024
acb462b
Common utils: export areNearlyEqual().
agarny Apr 21, 2024
265759b
Tests: have a couple of models integrated using computed and interpre…
agarny Apr 21, 2024
208157f
Tests: updated the expected values for the generator tests.
agarny Apr 22, 2024
dcecc8d
GeneratorInterpreter: removed NLA system statements.
agarny Apr 22, 2024
5755083
InterpretStatement: renamed to InterpretAstStatement.
agarny Apr 22, 2024
76e743c
Debug: some minor cleaning up.
agarny Apr 22, 2024
fa196e4
Interpreter: added an RPN-based statement class.
agarny Apr 22, 2024
50a4923
Debug: added a way to print RPN statements.
agarny Apr 22, 2024
cf5da30
Interpreter: removed the RPN-based interpreter.
agarny Apr 23, 2024
03d6043
Interpreter: renamed InterpreterAstStatement to InterpreterStatement.
agarny Apr 23, 2024
960472a
Generator tests: don't compare the compiled and interpreted models.
agarny Apr 23, 2024
0e40acd
Coverage tests: check the values we get from the interpreter.
agarny Apr 23, 2024
91595e1
Clarified some comments and improved our API documentation.
agarny Apr 24, 2024
f2884bc
Some minor cleaning up and improvement to the code.
agarny Apr 24, 2024
d81efdf
GeneratorProfile: updated the version of our C and Python profiles.
agarny Apr 24, 2024
50ef61a
C++: removed some assert() calls.
agarny Apr 24, 2024
f87c44d
GeneratorInterpreter: addressed some coverage issues.
agarny Apr 24, 2024
9900f4e
InterpreterStatement: addressed some coverage issues.
agarny Apr 24, 2024
519faa2
Interpreter: directly use `double *`.
agarny Apr 25, 2024
107fb7b
SWIG: cleaned up the Interpreter interface.
agarny Apr 26, 2024
2bcc1ca
Interpreter: don't keep track of the VOI, states, rates, and variables.
agarny Apr 25, 2024
c922a79
Python bindings: added support for NumPy for Interpreter.
agarny Apr 26, 2024
8fe2e97
Interpreter: temporarily disabled bindings.
agarny Apr 26, 2024
987b3db
Make gcc happy.
agarny Apr 30, 2024
160d855
Merge branch 'main' into issue1218
hsorby May 11, 2024
584ebb5
Merge branch 'main' into issue1218
nickerso May 16, 2024
33a527a
Merge branch 'issue1240' into issue1218.
agarny Jul 3, 2024
83fe400
Updated a generator test as a result of commit 33a527a4.
agarny Jul 3, 2024
4966bad
Some minor cleaning up.
agarny Jul 3, 2024
d51df65
Merge branch 'main' into issue1218.
agarny Jul 3, 2024
fd05860
Python docstrings tests: don't test for CellmlElementType.
agarny Aug 5, 2024
0207ff9
Code generator: use different arrays for constants, computed constant…
agarny Jul 12, 2024
329b01f
Generator: use different arrays for constants, computed constants, an…
agarny Aug 7, 2024
56a8658
Generator: use different arrays for constants, computed constants, an…
agarny Aug 7, 2024
94515cc
Generator: use different arrays for constants, computed constants, an…
agarny Aug 7, 2024
8488c49
Generator: use different arrays for constants, computed constants, an…
agarny Aug 7, 2024
5287d5b
Generator: use computed_constants and not computedConstants in Python.
agarny Aug 7, 2024
82c104e
Generator profile: bumped the C and Python versions.
agarny Aug 7, 2024
0f8fbf3
Tests: automatically generate the expected file contents.
agarny Aug 8, 2024
c2504d7
Generator profile: added setters/getters for constants, computed cons…
agarny Aug 7, 2024
01bfdec
Analyser: track the constant, computed constant, and algebraic indexes.
agarny Aug 8, 2024
09fcc1f
Some minor cleaning up.
agarny Aug 8, 2024
a7c7774
Generator: added an external array.
agarny Aug 8, 2024
ef86447
Updated JavaScript tests.
agarny Aug 8, 2024
9d7174d
Analyser: keep track of computed constants and external variables for…
agarny Aug 8, 2024
60b26bc
Analyser: some minor cleaning up.
agarny Aug 8, 2024
05aa338
AnalyserModel: keep track of the constants, computed constants, and e…
agarny Aug 8, 2024
7c0d8a1
AnalyserEquation: keep track of states and constants.
agarny Aug 9, 2024
9f8bf25
Generator: generate the CONSTANT_INFO, COMPUTED_CONSTANT_INFO, ALGEBR…
agarny Aug 12, 2024
4bc05e8
Generator: don't need to mention the type of a variable in a XXX_INFO…
agarny Aug 14, 2024
330f6d6
GeneratorProfile: extracted generator profile_p.h.
agarny Aug 14, 2024
aaaeed3
Generator: updated the createXxxArray() methods.
agarny Aug 14, 2024
46e4e93
Generator: updated the signature of our initialiseVariables() method.
agarny Aug 15, 2024
fa807fb
GeneratorProfile: fixed a small issue with our Python profile.
agarny Aug 15, 2024
71ae73b
Generator: initialise things in initialiseVariables() in the order of…
agarny Aug 15, 2024
b1b7536
Generator: initialise all computed constants in computeComputedConsta…
agarny Aug 15, 2024
a46dbca
GeneratorProfile: added the external array string.
agarny Aug 16, 2024
0a05ef9
Generator: don't initialise our external variables in initialiseVaria…
agarny Aug 16, 2024
b514746
Analyser: a variable using an NLA should always be an algebraic varia…
agarny Aug 16, 2024
153b4b5
Analyser: some minor cleaning up.
agarny Aug 16, 2024
19126a8
Analyser: properly set the index of external variables.
agarny Aug 16, 2024
841c676
Analyser: put some struct/class definitions in a corresponding privat…
agarny Aug 16, 2024
8afeb5c
Analyser: simplified things.
agarny Aug 16, 2024
40d3fb4
Generator: make sure that constants are initialised when they are nee…
agarny Aug 17, 2024
b32d169
Generator: renamed the "external" array to "externals".
agarny Aug 19, 2024
8cba9cd
Generator: "initialise" computed constants in initialiseVariables().
agarny Aug 19, 2024
65e1d18
Generator: initialise things in initialiseVariables() in the order of…
agarny Aug 19, 2024
327225a
GeneratorProfile: pass the computedConstants array to initialiseVaria…
agarny Aug 19, 2024
d1020eb
GeneratorProfile: don't need to pass the VOI to initialiseVariables().
agarny Aug 19, 2024
f3bbce3
Tests: removed unneeded generated C/Python files.
agarny Aug 19, 2024
1f09630
Generator: make sure that constants are initialised when they are nee…
agarny Aug 19, 2024
b54f688
GeneratorProfile: use the constants, computed constants, and algebrai…
agarny Aug 19, 2024
d165208
GeneratorProfile: use the constants, computed constants, and algebrai…
agarny Aug 19, 2024
183d531
Tests: some minor cleaning up.
agarny Aug 20, 2024
54e6673
Some minor cleaning up.
agarny Aug 21, 2024
62dc092
GeneratorProfile: use the externals array to retrieve the value of ex…
agarny Aug 20, 2024
4bf1afc
Addressed various coverage issues as a result of our work on issue #1…
agarny Aug 20, 2024
68ad0fc
Some minor cleaning up.
agarny Aug 28, 2024
ff5a1a2
Analyser: improved unit scaling.
agarny Aug 27, 2024
c83f5c7
Some minor cleaning up.
agarny Sep 2, 2024
26ba852
Generator: make sure that NLA systems have access to external variables.
agarny Sep 3, 2024
68c9895
Generator: fixed a small issue with our Python profile.
agarny Sep 5, 2024
f0957e0
Tests: added a test to generate some code for the DAE version of the …
agarny Sep 5, 2024
49b3a4f
Tests: changed the external variable in algebraicEqnWithOneNonIsolate…
agarny Sep 6, 2024
6b74014
Python: improved the API documentation.
agarny Sep 10, 2024
dcbd038
Some minor cleaning up.
agarny Sep 10, 2024
3a25f12
Merge branch 'issue1243' into issue1218
agarny Sep 13, 2024
9af7d95
Various changes following the merge at commit 3a25f124.
agarny Sep 13, 2024
7936418
Interpreter: added support for external variables.
agarny Sep 18, 2024
707e211
Code spelling.
agarny Sep 18, 2024
e96b48f
Merge branch 'main' into issue1218.
agarny Oct 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
C++: removed some assert() calls.
  • Loading branch information
agarny committed Apr 25, 2024
commit 50ef61a0ba317cac5e03f2e6372b6f3939cf319e
11 changes: 0 additions & 11 deletions src/interpreterstatement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ limitations under the License.

#include "interpreterstatement.h"

#include <cassert>
#include <cmath>

#include "libcellml/interpreter.h"
Expand Down Expand Up @@ -68,10 +67,6 @@ InterpreterStatement::InterpreterStatementImpl::InterpreterStatementImpl(size_t

void InterpreterStatement::InterpreterStatementImpl::evaluate(double voi, double *states, double *rates, double *variables) const
{
//---GRY--- ONLY HANDLE AN EQUALITY STATEMENT FOR NOW.

assert(mType == Type::EQUALITY);

if (mLeftChild->mPimpl->mType == InterpreterStatement::Type::STATE) {
states[mLeftChild->mPimpl->mIndex] = mRightChild->mPimpl->evaluateToDouble(voi, states, rates, variables);
} else if (mLeftChild->mPimpl->mType == InterpreterStatement::Type::RATE) {
Expand Down Expand Up @@ -203,8 +198,6 @@ double InterpreterStatement::InterpreterStatementImpl::evaluateToDouble(double v
// Piecewise statement.

case Type::PIECEWISE: {
assert(mLeftChild->mPimpl->mType == Type::PIECE);

return (mLeftChild->mPimpl->mRightChild->mPimpl->evaluateToDouble(voi, states, rates, variables)) ?
mLeftChild->mPimpl->mLeftChild->mPimpl->evaluateToDouble(voi, states, rates, variables) :
mRightChild->mPimpl->evaluateToDouble(voi, states, rates, variables);
Expand Down Expand Up @@ -244,10 +237,6 @@ double InterpreterStatement::InterpreterStatementImpl::evaluateToDouble(double v
return NAN;
}
default: { // Type::EXTERNAL:
//---GRY--- JUST RETURN NAN FOR NOW.

assert(mType == Type::EXTERNAL);

static const auto NAN = std::numeric_limits<double>::quiet_NaN();

return NAN;
Expand Down