Skip to content

Generator: fix a couple of issues with the Python profile #1376

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.

Sign up for GitHub

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

Merged
agarny merged 2 commits into from
Apr 22, 2026
Merged

Generator: fix a couple of issues with the Python profile #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c96372e
Generator: fixed a couple of issues with the Python profile.
agarny Apr 17, 2026
d471d7d
Merge branch 'main' into issue1375
agarny Apr 22, 2026
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
6 changes: 3 additions & 3 deletions src/generatorprofile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi
"\n";

mInterfaceVersionString = "";
mImplementationVersionString = "__version__ = \"0.7.0\"\n";
mImplementationVersionString = "__version__ = \"0.8.0\"\n";

mInterfaceLibcellmlVersionString = "";
mImplementationLibcellmlVersionString = "LIBCELLML_VERSION = \"[LIBCELLML_VERSION]\"\n";
Expand Down Expand Up @@ -799,8 +799,8 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi
mRatesArrayString = "rates";
mConstantsArrayString = "constants";
mComputedConstantsArrayString = "computed_constants";
mAlgebraicVariablesArrayString = "algebraicVariables";
mExternalVariablesArrayString = "externalVariables";
mAlgebraicVariablesArrayString = "algebraic_variables";
mExternalVariablesArrayString = "external_variables";

mExternalVariableMethodTypeDefinitionNonDiffString = "";
mExternalVariableMethodTypeDefinitionDiffString = "";
Expand Down
2 changes: 1 addition & 1 deletion src/generatorprofilesha1values.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ namespace libcellml {
* See docs/dev_utilities.rst for further information.
*/
static const char C_GENERATOR_PROFILE_SHA1[] = "949c36b0108bc8cf9f41ff563f9ec1369d399a7c";
static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "83fd0b434381e6afb19fce7ab2f4002ad884f3cb";
static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "1f277b0e20a102ae0b63b63383cf4c0606f28034";

} // namespace libcellml
24 changes: 12 additions & 12 deletions tests/resources/coverage/generator/model.modified.profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0.post0"
__version__ = "0.8.0.post0"
LIBCELLML_VERSION = "0.6.3"

STATE_COUNT = 1
Expand Down Expand Up @@ -375,23 +375,23 @@ def objective_function_0(u, f, data):
algebraic_variables = data[5]
external_variables = data[6]

algebraicVariables[0] = u[0]
algebraicVariables[1] = u[1]
algebraic_variables[0] = u[0]
algebraic_variables[1] = u[1]

f[0] = algebraicVariables[1]+algebraicVariables[0]+states[0]-0.0
f[1] = algebraicVariables[1]-algebraicVariables[0]-(computed_constants[198]+computed_constants[197])
f[0] = algebraic_variables[1]+algebraic_variables[0]+states[0]-0.0
f[1] = algebraic_variables[1]-algebraic_variables[0]-(computed_constants[198]+computed_constants[197])


def find_root_0(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables):
u = [nan]*2

u[0] = algebraicVariables[0]
u[1] = algebraicVariables[1]
u[0] = algebraic_variables[0]
u[1] = algebraic_variables[1]

u = nla_solve(objective_function_0, u, 2, [voi, states, rates, constants, computed_constants, algebraic_variables, external_variables])

algebraicVariables[0] = u[0]
algebraicVariables[1] = u[1]
algebraic_variables[0] = u[0]
algebraic_variables[1] = u[1]


def initialise_arrays(states, rates, constants, computed_constants, algebraic_variables):
Expand All @@ -415,8 +415,8 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va
computed_constants[186] = nan
computed_constants[198] = 1.0
computed_constants[197] = 3.0
algebraicVariables[0] = 2.0
algebraicVariables[1] = 1.0
algebraic_variables[0] = 2.0
algebraic_variables[1] = 1.0


def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables):
Expand Down Expand Up @@ -614,5 +614,5 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v


def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, external_variable):
externalVariables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
external_variables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
find_root_0(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables)
24 changes: 12 additions & 12 deletions tests/resources/coverage/generator/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

STATE_COUNT = 1
Expand Down Expand Up @@ -375,23 +375,23 @@ def objective_function_0(u, f, data):
algebraic_variables = data[5]
external_variables = data[6]

algebraicVariables[0] = u[0]
algebraicVariables[1] = u[1]
algebraic_variables[0] = u[0]
algebraic_variables[1] = u[1]

f[0] = algebraicVariables[1]+algebraicVariables[0]+states[0]-0.0
f[1] = algebraicVariables[1]-algebraicVariables[0]-(computed_constants[198]+computed_constants[197])
f[0] = algebraic_variables[1]+algebraic_variables[0]+states[0]-0.0
f[1] = algebraic_variables[1]-algebraic_variables[0]-(computed_constants[198]+computed_constants[197])


def find_root_0(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables):
u = [nan]*2

u[0] = algebraicVariables[0]
u[1] = algebraicVariables[1]
u[0] = algebraic_variables[0]
u[1] = algebraic_variables[1]

u = nla_solve(objective_function_0, u, 2, [voi, states, rates, constants, computed_constants, algebraic_variables, external_variables])

algebraicVariables[0] = u[0]
algebraicVariables[1] = u[1]
algebraic_variables[0] = u[0]
algebraic_variables[1] = u[1]


def initialise_arrays(states, rates, constants, computed_constants, algebraic_variables):
Expand All @@ -415,8 +415,8 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va
computed_constants[186] = nan
computed_constants[198] = 1.0
computed_constants[197] = 3.0
algebraicVariables[0] = 2.0
algebraicVariables[1] = 1.0
algebraic_variables[0] = 2.0
algebraic_variables[1] = 1.0


def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables):
Expand Down Expand Up @@ -614,5 +614,5 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v


def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, external_variable):
externalVariables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
external_variables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
find_root_0(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables)
6 changes: 3 additions & 3 deletions tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 0
Expand Down Expand Up @@ -52,5 +52,5 @@ def compute_computed_constants(constants, computed_constants, algebraic_variable


def compute_variables(constants, computed_constants, algebraic_variables, external_variables, external_variable):
externalVariables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
algebraicVariables[0] = externalVariables[0]
external_variables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
algebraic_variables[0] = external_variables[0]
2 changes: 1 addition & 1 deletion tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 0
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 1
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 0
Expand Down
4 changes: 2 additions & 2 deletions tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

STATE_COUNT = 1
Expand Down Expand Up @@ -60,4 +60,4 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v


def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables):
algebraicVariables[0] = rates[0]
algebraic_variables[0] = rates[0]
4 changes: 2 additions & 2 deletions tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

STATE_COUNT = 1
Expand Down Expand Up @@ -60,4 +60,4 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v


def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables):
algebraicVariables[0] = rates[0]
algebraic_variables[0] = rates[0]
4 changes: 2 additions & 2 deletions tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

STATE_COUNT = 1
Expand Down Expand Up @@ -60,4 +60,4 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v


def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables):
algebraicVariables[0] = 2.0*states[0]
algebraic_variables[0] = 2.0*states[0]
4 changes: 2 additions & 2 deletions tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

STATE_COUNT = 1
Expand Down Expand Up @@ -60,4 +60,4 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v


def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables):
algebraicVariables[0] = 2.0*states[0]
algebraic_variables[0] = 2.0*states[0]
14 changes: 7 additions & 7 deletions tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 0
Expand Down Expand Up @@ -54,31 +54,31 @@ def objective_function_0(u, f, data):
algebraic_variables = data[2]
external_variables = data[3]

algebraicVariables[0] = u[0]
algebraic_variables[0] = u[0]

f[0] = algebraicVariables[0]+computed_constants[0]-(externalVariables[0]+computed_constants[1])
f[0] = algebraic_variables[0]+computed_constants[0]-(external_variables[0]+computed_constants[1])


def find_root_0(constants, computed_constants, algebraic_variables, external_variables):
u = [nan]*1

u[0] = algebraicVariables[0]
u[0] = algebraic_variables[0]

u = nla_solve(objective_function_0, u, 1, [constants, computed_constants, algebraic_variables, external_variables])

algebraicVariables[0] = u[0]
algebraic_variables[0] = u[0]


def initialise_arrays(constants, computed_constants, algebraic_variables):
computed_constants[0] = 3.0
computed_constants[1] = 7.0
algebraicVariables[0] = 1.0
algebraic_variables[0] = 1.0


def compute_computed_constants(constants, computed_constants, algebraic_variables):
pass


def compute_variables(constants, computed_constants, algebraic_variables, external_variables, external_variable):
externalVariables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
external_variables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
find_root_0(constants, computed_constants, algebraic_variables, external_variables)
12 changes: 6 additions & 6 deletions tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 0
Expand Down Expand Up @@ -45,26 +45,26 @@ def objective_function_0(u, f, data):
computed_constants = data[1]
algebraic_variables = data[2]

algebraicVariables[0] = u[0]
algebraic_variables[0] = u[0]

f[0] = algebraicVariables[0]+computed_constants[0]-(computed_constants[1]+computed_constants[2])
f[0] = algebraic_variables[0]+computed_constants[0]-(computed_constants[1]+computed_constants[2])


def find_root_0(constants, computed_constants, algebraic_variables):
u = [nan]*1

u[0] = algebraicVariables[0]
u[0] = algebraic_variables[0]

u = nla_solve(objective_function_0, u, 1, [constants, computed_constants, algebraic_variables])

algebraicVariables[0] = u[0]
algebraic_variables[0] = u[0]


def initialise_arrays(constants, computed_constants, algebraic_variables):
computed_constants[0] = 3.0
computed_constants[1] = 5.0
computed_constants[2] = 7.0
algebraicVariables[0] = 1.0
algebraic_variables[0] = 1.0


def compute_computed_constants(constants, computed_constants, algebraic_variables):
Expand Down
8 changes: 4 additions & 4 deletions tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from math import *


__version__ = "0.7.0"
__version__ = "0.8.0"
LIBCELLML_VERSION = "0.6.3"

CONSTANT_COUNT = 0
Expand Down Expand Up @@ -53,6 +53,6 @@ def compute_computed_constants(constants, computed_constants, algebraic_variable


def compute_variables(constants, computed_constants, algebraic_variables, external_variables, external_variable):
externalVariables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
externalVariables[1] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 1)
externalVariables[2] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 2)
external_variables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
external_variables[1] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 1)
external_variables[2] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 2)
Loading
Loading