Code generator: use different arrays for constants, computed constants, and algebraic variables #1247

agarny · 2024-08-06T20:29:29Z

…s, and algebraic variables.

…d algebraic variables for initialiseVariables().

…d algebraic variables for computeRates().

…d algebraic variables for computeVariables().

…d algebraic variables for computeComputedConstants().

To do it manually is very time consuming while here it gets done automatically. From there, we can quickly confirm, using git, whether the new expected file contents is correct.

…tants, and algebraic arrays.

… an equation. We will also need to keep track of states and constants.

…nalyserVariable().

…Impl::doAddImplementationVariableInfoCode().

…:addImplementationVariableInfoCode().

…uationCode().

agarny · 2025-11-04T04:36:36Z

@hsorby / @nickerso: I believe I have addressed Hugh's issues.

src/generator.cpp

hsorby · 2025-11-04T04:49:15Z

Can discuss that on Tuesday, if you want. (I am offline tomorrow).

I feel this may be a 4.15 Friday discussion?

…sh between our two types of variables.

This is more consistent with our `createXxxArray()` methods and `deleteArray()` method.

agarny · 2025-11-04T10:33:57Z

How do people feel about the API consistency we have create_algebriac_array() but initialise_variables(), which initialises states and constants. Do we just need initialise_arrays().
Not keen on initialise_arrays(), but agree that initialise_variables() is not great. What about initialise_model()?

Just remembered that we haven't got a consensus on this one. Thinking more about it, I guess we could have initialiseArrays(). At least, it would be consistent with our createXxxArray() methods and our deleteArray() method. Also, I think it would make more sense to use `initialiseComputedConstants

Ok, done in b4045c6.

agarny · 2025-11-04T21:19:44Z

By the way, we replaced instances like const AnalyserVariablePtr &variable with const AnalyserVariablePtr &analyserVariable, but if anything this has made our code less consistent. Indeed, if we are to do that then we should do something similar with things like const AnalyserModelPtr &model, const AnalyserEquationPtr &equation, const AnalyserEquationAstPtr &equationAst, const AnalyserExternalVariablePtr &externalVariable, etc. and... also with the internal variants (e.g., const AnalyserInternalVariablePtr &variable).

So... I guess I should replace all of those too...? @hsorby?

hsorby · 2025-11-04T22:52:57Z

By the way, we replaced instances like const AnalyserVariablePtr &variable with const AnalyserVariablePtr &analyserVariable, but if anything this has made our code less consistent. Indeed, if we are to do that then we should do something similar with things like const AnalyserModelPtr &model, const AnalyserEquationPtr &equation, const AnalyserEquationAstPtr &equationAst, const AnalyserExternalVariablePtr &externalVariable, etc. and... also with the internal variants (e.g., const AnalyserInternalVariablePtr &variable).

So... I guess I should replace all of those too...? @hsorby?

I think this PR is heavy enough as is and maybe the case for a new issue and then do this separately to this PR.

agarny · 2025-11-04T23:42:19Z

I think this PR is heavy enough as is and maybe the case for a new issue and then do this separately to this PR.

Fair enough. Would then be good to merge this PR ASAP, so that I can submit a follow-up PR.

hsorby

analyser_p.h needs adding to GIT_HEADER_FILES

Some minor edits for me then I think it will ge all good.

src/analyser_p.h

src/generator.cpp

agarny · 2025-11-05T10:30:12Z

analyser_p.h needs adding to GIT_HEADER_FILES

Oops, done in 37e2b7b.

agarny · 2025-11-05T23:41:32Z

Ok, I believe we are good to go @hsorby and @nickerso.

Python docstrings tests: don't test for CellmlElementType.

fd05860

agarny force-pushed the issue1243 branch 5 times, most recently from 874f4a6 to 5628b66 Compare August 7, 2024 12:03

Code generator: use different arrays for constants, computed constant…

0207ff9

…s, and algebraic variables.

agarny force-pushed the issue1243 branch from 5628b66 to 0207ff9 Compare August 7, 2024 12:24

agarny added 8 commits August 7, 2024 16:21

Generator: use different arrays for constants, computed constants, an…

329b01f

…d algebraic variables for initialiseVariables().

Generator: use different arrays for constants, computed constants, an…

56a8658

…d algebraic variables for computeRates().

Generator: use different arrays for constants, computed constants, an…

94515cc

…d algebraic variables for computeVariables().

Generator: use different arrays for constants, computed constants, an…

8488c49

…d algebraic variables for computeComputedConstants().

Generator: use computed_constants and not computedConstants in Python.

5287d5b

Generator profile: bumped the C and Python versions.

82c104e

Tests: automatically generate the expected file contents.

0f8fbf3

To do it manually is very time consuming while here it gets done automatically. From there, we can quickly confirm, using git, whether the new expected file contents is correct.

Generator profile: added setters/getters for constants, computed cons…

c2504d7

…tants, and algebraic arrays.

agarny force-pushed the issue1243 branch from 446ce77 to 179ea91 Compare August 8, 2024 09:46

Analyser: track the constant, computed constant, and algebraic indexes.

01bfdec

agarny force-pushed the issue1243 branch from 179ea91 to 01bfdec Compare August 8, 2024 09:57

agarny added 3 commits August 8, 2024 13:42

Some minor cleaning up.

09fcc1f

Generator: added an external array.

a7c7774

Updated JavaScript tests.

ef86447

agarny force-pushed the issue1243 branch from 2b80aaf to ef86447 Compare August 8, 2024 15:38

Analyser: keep track of computed constants and external variables for…

9d7174d

… an equation. We will also need to keep track of states and constants.

agarny force-pushed the issue1243 branch 6 times, most recently from f21044c to 3f1e632 Compare August 9, 2024 16:00

agarny force-pushed the issue1243 branch 2 times, most recently from da8d589 to ab7db7e Compare November 4, 2025 03:36

Renamed algebraic and external variables.

f76d0b1

agarny force-pushed the issue1243 branch from ab7db7e to f76d0b1 Compare November 4, 2025 03:40

agarny added 7 commits November 4, 2025 16:50

Generator: improved the implementation of Generator::GeneratorImpl::a…

01ab593

…nalyserVariable().

Generator: use temporary variable.

94c5468

Generator: use a more suitable parameter name in Generator::Generator…

0114a61

…Impl::doAddImplementationVariableInfoCode().

Generator: simplified the implementation of Generator::GeneratorImpl:…

7b73df6

…:addImplementationVariableInfoCode().

Generator: slight improvement to Generator::GeneratorImpl::generateEq…

c8ffaf2

…uationCode().

Generator: use C++ overloading functionality.

8c5ef05

Utilities: renamed our variables() utility to analyserVariables().

bbc20a9

hsorby reviewed Nov 4, 2025

View reviewed changes

src/generator.cpp Outdated Show resolved Hide resolved

agarny added 2 commits November 4, 2025 18:35

Generator: use analyserVariable rather than variable to distingui…

e46d267

…sh between our two types of variables.

Generator: replaced initialiseVariables() with initialiseArrays().

b4045c6

This is more consistent with our `createXxxArray()` methods and `deleteArray()` method.

agarny force-pushed the issue1243 branch from b2ebe42 to b4045c6 Compare November 4, 2025 10:31

agarny mentioned this pull request Nov 5, 2025

Analyser/Generator cleaning up #1336

Open

hsorby reviewed Nov 5, 2025

View reviewed changes

src/analyser_p.h Outdated Show resolved Hide resolved

src/generator.cpp Show resolved Hide resolved

src/generator.cpp Outdated Show resolved Hide resolved

agarny added 2 commits November 5, 2025 22:49

CMake: added analyser_p.h to GIT_HEADER_FILES.

37e2b7b

src/analyser_p.h: removed unneeded header.

cc143c4

Analyser/Generator: some cleaning up around the libcellml namespace.

bd6d67d

agarny force-pushed the issue1243 branch from f92caf5 to bd6d67d Compare November 5, 2025 23:39

hsorby approved these changes Nov 5, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Code generator: use different arrays for constants, computed constants, and algebraic variables #1247

Code generator: use different arrays for constants, computed constants, and algebraic variables #1247

Uh oh!

agarny commented Aug 6, 2024

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

Uh oh!

hsorby commented Nov 4, 2025

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

hsorby commented Nov 4, 2025

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

hsorby left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

agarny commented Nov 5, 2025

Uh oh!

agarny commented Nov 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Code generator: use different arrays for constants, computed constants, and algebraic variables #1247

Are you sure you want to change the base?

Code generator: use different arrays for constants, computed constants, and algebraic variables #1247

Uh oh!

Conversation

agarny commented Aug 6, 2024

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

Uh oh!

hsorby commented Nov 4, 2025

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

hsorby commented Nov 4, 2025

Uh oh!

agarny commented Nov 4, 2025

Uh oh!

hsorby left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

agarny commented Nov 5, 2025

Uh oh!

agarny commented Nov 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants