Skip to content

Commit fce139c

Browse files
agarnyagarny
committed
Merge branch 'issue1366' into issue1368.
2 parents 6c970b7 + 4fd6a06 commit fce139c

81 files changed

Lines changed: 1758 additions & 1758 deletions

File tree

Some content is hidden

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

‎src/generatorprofile.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi
741741
"\n";
742742

743743
mInterfaceVersionString = "";
744-
mImplementationVersionString = "__version__ = \"0.7.0\"\n";
744+
mImplementationVersionString = "__version__ = \"0.8.0\"\n";
745745

746746
mInterfaceLibcellmlVersionString = "";
747747
mImplementationLibcellmlVersionString = "LIBCELLML_VERSION = \"[LIBCELLML_VERSION]\"\n";
@@ -799,8 +799,8 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi
799799
mRatesArrayString = "rates";
800800
mConstantsArrayString = "constants";
801801
mComputedConstantsArrayString = "computed_constants";
802-
mAlgebraicVariablesArrayString = "algebraicVariables";
803-
mExternalVariablesArrayString = "externalVariables";
802+
mAlgebraicVariablesArrayString = "algebraic_variables";
803+
mExternalVariablesArrayString = "external_variables";
804804

805805
mExternalVariableMethodTypeDefinitionNonDiffString = "";
806806
mExternalVariableMethodTypeDefinitionDiffString = "";

‎src/generatorprofilesha1values.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ namespace libcellml {
2525
* See docs/dev_utilities.rst for further information.
2626
*/
2727
static const char C_GENERATOR_PROFILE_SHA1[] = "949c36b0108bc8cf9f41ff563f9ec1369d399a7c";
28-
static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "83fd0b434381e6afb19fce7ab2f4002ad884f3cb";
28+
static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "1f277b0e20a102ae0b63b63383cf4c0606f28034";
2929

3030
} // namespace libcellml

‎tests/resources/coverage/generator/model.modified.profile.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0.post0"
7+
__version__ = "0.8.0.post0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
STATE_COUNT = 1
@@ -375,23 +375,23 @@ def objective_function_0(u, f, data):
375375
algebraic_variables = data[5]
376376
external_variables = data[6]
377377

378-
algebraicVariables[0] = u[0]
379-
algebraicVariables[1] = u[1]
378+
algebraic_variables[0] = u[0]
379+
algebraic_variables[1] = u[1]
380380

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

384384

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

388-
u[0] = algebraicVariables[0]
389-
u[1] = algebraicVariables[1]
388+
u[0] = algebraic_variables[0]
389+
u[1] = algebraic_variables[1]
390390

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

393-
algebraicVariables[0] = u[0]
394-
algebraicVariables[1] = u[1]
393+
algebraic_variables[0] = u[0]
394+
algebraic_variables[1] = u[1]
395395

396396

397397
def initialise_arrays(states, rates, constants, computed_constants, algebraic_variables):
@@ -415,8 +415,8 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va
415415
computed_constants[186] = nan
416416
computed_constants[198] = 1.0
417417
computed_constants[197] = 3.0
418-
algebraicVariables[0] = 2.0
419-
algebraicVariables[1] = 1.0
418+
algebraic_variables[0] = 2.0
419+
algebraic_variables[1] = 1.0
420420

421421

422422
def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables):
@@ -614,5 +614,5 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v
614614

615615

616616
def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, external_variable):
617-
externalVariables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
617+
external_variables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
618618
find_root_0(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables)

‎tests/resources/coverage/generator/model.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
STATE_COUNT = 1
@@ -375,23 +375,23 @@ def objective_function_0(u, f, data):
375375
algebraic_variables = data[5]
376376
external_variables = data[6]
377377

378-
algebraicVariables[0] = u[0]
379-
algebraicVariables[1] = u[1]
378+
algebraic_variables[0] = u[0]
379+
algebraic_variables[1] = u[1]
380380

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

384384

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

388-
u[0] = algebraicVariables[0]
389-
u[1] = algebraicVariables[1]
388+
u[0] = algebraic_variables[0]
389+
u[1] = algebraic_variables[1]
390390

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

393-
algebraicVariables[0] = u[0]
394-
algebraicVariables[1] = u[1]
393+
algebraic_variables[0] = u[0]
394+
algebraic_variables[1] = u[1]
395395

396396

397397
def initialise_arrays(states, rates, constants, computed_constants, algebraic_variables):
@@ -415,8 +415,8 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va
415415
computed_constants[186] = nan
416416
computed_constants[198] = 1.0
417417
computed_constants[197] = 3.0
418-
algebraicVariables[0] = 2.0
419-
algebraicVariables[1] = 1.0
418+
algebraic_variables[0] = 2.0
419+
algebraic_variables[1] = 1.0
420420

421421

422422
def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables):
@@ -614,5 +614,5 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v
614614

615615

616616
def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, external_variable):
617-
externalVariables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
617+
external_variables[0] = external_variable(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables, 0)
618618
find_root_0(voi, states, rates, constants, computed_constants, algebraic_variables, external_variables)

‎tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
CONSTANT_COUNT = 0
@@ -52,5 +52,5 @@ def compute_computed_constants(constants, computed_constants, algebraic_variable
5252

5353

5454
def compute_variables(constants, computed_constants, algebraic_variables, external_variables, external_variable):
55-
externalVariables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
56-
algebraicVariables[0] = externalVariables[0]
55+
external_variables[0] = external_variable(constants, computed_constants, algebraic_variables, external_variables, 0)
56+
algebraic_variables[0] = external_variables[0]

‎tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
CONSTANT_COUNT = 0

‎tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
CONSTANT_COUNT = 1

‎tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
CONSTANT_COUNT = 0

‎tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
STATE_COUNT = 1
@@ -60,4 +60,4 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v
6060

6161

6262
def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables):
63-
algebraicVariables[0] = rates[0]
63+
algebraic_variables[0] = rates[0]

‎tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from math import *
55

66

7-
__version__ = "0.7.0"
7+
__version__ = "0.8.0"
88
LIBCELLML_VERSION = "0.6.3"
99

1010
STATE_COUNT = 1
@@ -60,4 +60,4 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v
6060

6161

6262
def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables):
63-
algebraicVariables[0] = rates[0]
63+
algebraic_variables[0] = rates[0]

0 commit comments

Comments
 (0)