diff --git a/src/generatorprofile.cpp b/src/generatorprofile.cpp index ed7f3f8478..f4904a2f73 100644 --- a/src/generatorprofile.cpp +++ b/src/generatorprofile.cpp @@ -225,7 +225,7 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "#include \n"; mInterfaceVersionString = "extern const char VERSION[];\n"; - mImplementationVersionString = "const char VERSION[] = \"0.7.0\";\n"; + mImplementationVersionString = "const char VERSION[] = \"0.8.0\";\n"; mInterfaceLibcellmlVersionString = "extern const char LIBCELLML_VERSION[];\n"; mImplementationLibcellmlVersionString = "const char LIBCELLML_VERSION[] = \"[LIBCELLML_VERSION]\";\n"; @@ -269,13 +269,13 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "[CODE]" "};\n"; - mInterfaceAlgebraicVariableInfoString = "extern const VariableInfo ALGEBRAIC_INFO[];\n"; - mImplementationAlgebraicVariableInfoString = "const VariableInfo ALGEBRAIC_INFO[] = {\n" + mInterfaceAlgebraicVariableInfoString = "extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[];\n"; + mImplementationAlgebraicVariableInfoString = "const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = {\n" "[CODE]" "};\n"; - mInterfaceExternalVariableInfoString = "extern const VariableInfo EXTERNAL_INFO[];\n"; - mImplementationExternalVariableInfoString = "const VariableInfo EXTERNAL_INFO[] = {\n" + mInterfaceExternalVariableInfoString = "extern const VariableInfo EXTERNAL_VARIABLE_INFO[];\n"; + mImplementationExternalVariableInfoString = "const VariableInfo EXTERNAL_VARIABLE_INFO[] = {\n" "[CODE]" "};\n"; @@ -489,14 +489,14 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "[CODE]" "}\n"; - mInterfaceComputeComputedConstantsMethodNonDiffString = "void computeComputedConstants(double *constants, double *computedConstants, double *algebraic);\n"; - mImplementationComputeComputedConstantsMethodNonDiffString = "void computeComputedConstants(double *constants, double *computedConstants, double *algebraic)\n" + mInterfaceComputeComputedConstantsMethodNonDiffString = "void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables);\n"; + mImplementationComputeComputedConstantsMethodNonDiffString = "void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables)\n" "{\n" "[CODE]" "}\n"; - mInterfaceComputeComputedConstantsMethodDiffString = "void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic);\n"; - mImplementationComputeComputedConstantsMethodDiffString = "void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic)\n" + mInterfaceComputeComputedConstantsMethodDiffString = "void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables);\n"; + mImplementationComputeComputedConstantsMethodDiffString = "void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables)\n" "{\n" "[CODE]" "}\n"; @@ -741,7 +741,7 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "\n"; mInterfaceVersionString = ""; - mImplementationVersionString = "__version__ = \"0.6.0\"\n"; + mImplementationVersionString = "__version__ = \"0.7.0\"\n"; mInterfaceLibcellmlVersionString = ""; mImplementationLibcellmlVersionString = "LIBCELLML_VERSION = \"[LIBCELLML_VERSION]\"\n"; @@ -782,12 +782,12 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "]\n"; mInterfaceAlgebraicVariableInfoString = ""; - mImplementationAlgebraicVariableInfoString = "ALGEBRAIC_INFO = [\n" + mImplementationAlgebraicVariableInfoString = "ALGEBRAIC_VARIABLE_INFO = [\n" "[CODE]" "]\n"; mInterfaceExternalVariableInfoString = ""; - mImplementationExternalVariableInfoString = "EXTERNAL_INFO = [\n" + mImplementationExternalVariableInfoString = "EXTERNAL_VARIABLE_INFO = [\n" "[CODE]" "]\n"; @@ -928,12 +928,12 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi mInterfaceComputeComputedConstantsMethodNonDiffString = ""; mImplementationComputeComputedConstantsMethodNonDiffString = "\n" - "def compute_computed_constants(constants, computed_constants, algebraic):\n" + "def compute_computed_constants(constants, computed_constants, algebraic_variables):\n" "[CODE]"; mInterfaceComputeComputedConstantsMethodDiffString = ""; mImplementationComputeComputedConstantsMethodDiffString = "\n" - "def compute_computed_constants(states, rates, constants, computed_constants, algebraic):\n" + "def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables):\n" "[CODE]"; mInterfaceComputeRatesMethodWoevString = ""; diff --git a/src/generatorprofilesha1values.h b/src/generatorprofilesha1values.h index c21e4fcfe8..9c1ced1f13 100644 --- a/src/generatorprofilesha1values.h +++ b/src/generatorprofilesha1values.h @@ -24,7 +24,7 @@ namespace libcellml { * The content of this file is generated, do not edit this file directly. * See docs/dev_utilities.rst for further information. */ -static const char C_GENERATOR_PROFILE_SHA1[] = "24b7a2f82510d2f79aeaee509a1b1b04ea1d749b"; -static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "b117a2500aae147f477127f0bfb0e2c9e242c6c8"; +static const char C_GENERATOR_PROFILE_SHA1[] = "949c36b0108bc8cf9f41ff563f9ec1369d399a7c"; +static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "83fd0b434381e6afb19fce7ab2f4002ad884f3cb"; } // namespace libcellml diff --git a/tests/bindings/javascript/CMakeLists.txt b/tests/bindings/javascript/CMakeLists.txt index b8b645bc81..3f034ecfd8 100644 --- a/tests/bindings/javascript/CMakeLists.txt +++ b/tests/bindings/javascript/CMakeLists.txt @@ -61,7 +61,7 @@ set(TEST_PACKAGE_JSON "{ \"author\": \"\", \"license\": \"Apache-2.0\", \"devDependencies\": { - \"jest\": \"^26.6.3\" + \"jest\": \"^30.2.0\" }, \"dependencies\": { \"libcellml.js\": \"file:${_RELATIVE_PATH}\" diff --git a/tests/bindings/python/test_generator_profile.py b/tests/bindings/python/test_generator_profile.py index a5d27226cb..6e0ace69a3 100644 --- a/tests/bindings/python/test_generator_profile.py +++ b/tests/bindings/python/test_generator_profile.py @@ -698,12 +698,12 @@ def test_implementation_compute_computed_constants_method_string(self): g = GeneratorProfile() - self.assertEqual('void computeComputedConstants(double *constants, double *computedConstants, double *algebraic)\n{\n[CODE]}\n', + self.assertEqual('void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables)\n{\n[CODE]}\n', g.implementationComputeComputedConstantsMethodString(False)) g.setImplementationComputeComputedConstantsMethodString(False, GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.implementationComputeComputedConstantsMethodString(False)) - self.assertEqual('void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic)\n{\n[CODE]}\n', + self.assertEqual('void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables)\n{\n[CODE]}\n', g.implementationComputeComputedConstantsMethodString(True)) g.setImplementationComputeComputedConstantsMethodString(True, GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.implementationComputeComputedConstantsMethodString(True)) @@ -895,7 +895,7 @@ def test_implementation_algebraic_info_string(self): g = GeneratorProfile() - self.assertEqual('const VariableInfo ALGEBRAIC_INFO[] = {\n[CODE]};\n', g.implementationAlgebraicVariableInfoString()) + self.assertEqual('const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = {\n[CODE]};\n', g.implementationAlgebraicVariableInfoString()) g.setImplementationAlgebraicVariableInfoString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.implementationAlgebraicVariableInfoString()) @@ -904,7 +904,7 @@ def test_implementation_external_info_string(self): g = GeneratorProfile() - self.assertEqual('const VariableInfo EXTERNAL_INFO[] = {\n[CODE]};\n', g.implementationExternalVariableInfoString()) + self.assertEqual('const VariableInfo EXTERNAL_VARIABLE_INFO[] = {\n[CODE]};\n', g.implementationExternalVariableInfoString()) g.setImplementationExternalVariableInfoString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.implementationExternalVariableInfoString()) @@ -949,7 +949,7 @@ def test_implementation_version_string(self): g = GeneratorProfile() - self.assertEqual('const char VERSION[] = "0.7.0";\n', g.implementationVersionString()) + self.assertEqual('const char VERSION[] = "0.8.0";\n', g.implementationVersionString()) g.setImplementationVersionString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.implementationVersionString()) @@ -985,12 +985,12 @@ def test_interface_compute_computed_constants_method_string(self): g = GeneratorProfile() - self.assertEqual('void computeComputedConstants(double *constants, double *computedConstants, double *algebraic);\n', + self.assertEqual('void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables);\n', g.interfaceComputeComputedConstantsMethodString(False)) g.setInterfaceComputeComputedConstantsMethodString(False, GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.interfaceComputeComputedConstantsMethodString(False)) - self.assertEqual('void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic);\n', + self.assertEqual('void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables);\n', g.interfaceComputeComputedConstantsMethodString(True)) g.setInterfaceComputeComputedConstantsMethodString(True, GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.interfaceComputeComputedConstantsMethodString(True)) @@ -1178,7 +1178,7 @@ def test_interface_algebraic_info_string(self): g = GeneratorProfile() - self.assertEqual('extern const VariableInfo ALGEBRAIC_INFO[];\n', g.interfaceAlgebraicVariableInfoString()) + self.assertEqual('extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[];\n', g.interfaceAlgebraicVariableInfoString()) g.setInterfaceAlgebraicVariableInfoString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.interfaceAlgebraicVariableInfoString()) @@ -1187,7 +1187,7 @@ def test_interface_external_info_string(self): g = GeneratorProfile() - self.assertEqual('extern const VariableInfo EXTERNAL_INFO[];\n', g.interfaceExternalVariableInfoString()) + self.assertEqual('extern const VariableInfo EXTERNAL_VARIABLE_INFO[];\n', g.interfaceExternalVariableInfoString()) g.setInterfaceExternalVariableInfoString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.interfaceExternalVariableInfoString()) diff --git a/tests/generator/generatorprofile.cpp b/tests/generator/generatorprofile.cpp index 683a9692b4..b2e3e1337c 100644 --- a/tests/generator/generatorprofile.cpp +++ b/tests/generator/generatorprofile.cpp @@ -271,7 +271,7 @@ TEST(GeneratorProfile, defaultMiscellaneousValues) generatorProfile->implementationHeaderString()); EXPECT_EQ("extern const char VERSION[];\n", generatorProfile->interfaceVersionString()); - EXPECT_EQ("const char VERSION[] = \"0.7.0\";\n", generatorProfile->implementationVersionString()); + EXPECT_EQ("const char VERSION[] = \"0.8.0\";\n", generatorProfile->implementationVersionString()); EXPECT_EQ("extern const char LIBCELLML_VERSION[];\n", generatorProfile->interfaceLibcellmlVersionString()); EXPECT_EQ("const char LIBCELLML_VERSION[] = \"[LIBCELLML_VERSION]\";\n", generatorProfile->implementationLibcellmlVersionString()); @@ -319,14 +319,14 @@ TEST(GeneratorProfile, defaultMiscellaneousValues) "};\n", generatorProfile->implementationComputedConstantInfoString()); - EXPECT_EQ("extern const VariableInfo ALGEBRAIC_INFO[];\n", generatorProfile->interfaceAlgebraicVariableInfoString()); - EXPECT_EQ("const VariableInfo ALGEBRAIC_INFO[] = {\n" + EXPECT_EQ("extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[];\n", generatorProfile->interfaceAlgebraicVariableInfoString()); + EXPECT_EQ("const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = {\n" "[CODE]" "};\n", generatorProfile->implementationAlgebraicVariableInfoString()); - EXPECT_EQ("extern const VariableInfo EXTERNAL_INFO[];\n", generatorProfile->interfaceExternalVariableInfoString()); - EXPECT_EQ("const VariableInfo EXTERNAL_INFO[] = {\n" + EXPECT_EQ("extern const VariableInfo EXTERNAL_VARIABLE_INFO[];\n", generatorProfile->interfaceExternalVariableInfoString()); + EXPECT_EQ("const VariableInfo EXTERNAL_VARIABLE_INFO[] = {\n" "[CODE]" "};\n", generatorProfile->implementationExternalVariableInfoString()); @@ -574,17 +574,17 @@ TEST(GeneratorProfile, defaultMiscellaneousValues) "}\n", generatorProfile->implementationInitialiseArraysMethodString(true)); - EXPECT_EQ("void computeComputedConstants(double *constants, double *computedConstants, double *algebraic);\n", + EXPECT_EQ("void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables);\n", generatorProfile->interfaceComputeComputedConstantsMethodString(false)); - EXPECT_EQ("void computeComputedConstants(double *constants, double *computedConstants, double *algebraic)\n" + EXPECT_EQ("void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables)\n" "{\n" "[CODE]" "}\n", generatorProfile->implementationComputeComputedConstantsMethodString(false)); - EXPECT_EQ("void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic);\n", + EXPECT_EQ("void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables);\n", generatorProfile->interfaceComputeComputedConstantsMethodString(true)); - EXPECT_EQ("void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic)\n" + EXPECT_EQ("void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables)\n" "{\n" "[CODE]" "}\n", diff --git a/tests/resources/coverage/generator/model.c b/tests/resources/coverage/generator/model.c index fd5521da46..6e1abb2458 100644 --- a/tests/resources/coverage/generator/model.c +++ b/tests/resources/coverage/generator/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -232,12 +232,12 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"eqnComputedConstant1", "dimensionless", "my_component"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"eqnNlaVariable2", "dimensionless", "my_component"}, {"eqnNlaVariable1", "dimensionless", "my_component"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"eqnPlus", "dimensionless", "my_component"} }; @@ -452,7 +452,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[1] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1] == constants[0]; computedConstants[1] = constants[1]/(constants[0] == constants[0]); diff --git a/tests/resources/coverage/generator/model.h b/tests/resources/coverage/generator/model.h index 9568a7de80..25c5c203dc 100644 --- a/tests/resources/coverage/generator/model.h +++ b/tests/resources/coverage/generator/model.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/coverage/generator/model.implementation.out b/tests/resources/coverage/generator/model.implementation.out index 014dd8939d..aca3dbf8eb 100644 --- a/tests/resources/coverage/generator/model.implementation.out +++ b/tests/resources/coverage/generator/model.implementation.out @@ -211,7 +211,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[1] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = eq(constants[1], constants[0]); computedConstants[1] = constants[1]/eq(constants[0], constants[0]); diff --git a/tests/resources/coverage/generator/model.interface.out b/tests/resources/coverage/generator/model.interface.out index f7f199098a..9a4b3325db 100644 --- a/tests/resources/coverage/generator/model.interface.out +++ b/tests/resources/coverage/generator/model.interface.out @@ -15,6 +15,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/coverage/generator/model.modified.profile.c b/tests/resources/coverage/generator/model.modified.profile.c index 825cc7760c..d996fdd340 100644 --- a/tests/resources/coverage/generator/model.modified.profile.c +++ b/tests/resources/coverage/generator/model.modified.profile.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0.post0"; +const char VERSION[] = "0.8.0.post0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -232,12 +232,12 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"eqnComputedConstant1", "dimensionless", "my_component"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"eqnNlaVariable2", "dimensionless", "my_component"}, {"eqnNlaVariable1", "dimensionless", "my_component"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"eqnPlus", "dimensionless", "my_component"} }; @@ -452,7 +452,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[1] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1] == constants[0]; computedConstants[1] = constants[1]/(constants[0] == constants[0]); diff --git a/tests/resources/coverage/generator/model.modified.profile.h b/tests/resources/coverage/generator/model.modified.profile.h index 0a608f7837..4f7508ee54 100644 --- a/tests/resources/coverage/generator/model.modified.profile.h +++ b/tests/resources/coverage/generator/model.modified.profile.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesVector(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/coverage/generator/model.modified.profile.py b/tests/resources/coverage/generator/model.modified.profile.py index 76e84d822c..603652cf1f 100644 --- a/tests/resources/coverage/generator/model.modified.profile.py +++ b/tests/resources/coverage/generator/model.modified.profile.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0.post0" +__version__ = "0.7.0.post0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -231,12 +231,12 @@ {"name": "eqnComputedConstant1", "units": "dimensionless", "component": "my_component"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "eqnNlaVariable2", "units": "dimensionless", "component": "my_component"}, {"name": "eqnNlaVariable1", "units": "dimensionless", "component": "my_component"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "eqnPlus", "units": "dimensionless", "component": "my_component"} ] @@ -419,7 +419,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[1] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = eq_func(constants[1], constants[0]) computed_constants[1] = constants[1]/eq_func(constants[0], constants[0]) computed_constants[2] = neq_func(constants[1], constants[0]) diff --git a/tests/resources/coverage/generator/model.no.tracking.c b/tests/resources/coverage/generator/model.no.tracking.c index b5665cbcb9..ce71f600bb 100644 --- a/tests/resources/coverage/generator/model.no.tracking.c +++ b/tests/resources/coverage/generator/model.no.tracking.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -25,7 +25,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"eqnNlaVariable2", "dimensionless", "my_component"}, {"eqnNlaVariable1", "dimensionless", "my_component"} }; @@ -221,7 +221,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[1] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/coverage/generator/model.no.tracking.h b/tests/resources/coverage/generator/model.no.tracking.h index 86c60ae92f..c5d2c65e9f 100644 --- a/tests/resources/coverage/generator/model.no.tracking.h +++ b/tests/resources/coverage/generator/model.no.tracking.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/coverage/generator/model.out b/tests/resources/coverage/generator/model.out index f705cd845b..711a0b99f2 100644 --- a/tests/resources/coverage/generator/model.out +++ b/tests/resources/coverage/generator/model.out @@ -122,7 +122,7 @@ void findRoot0(double voi, double *states, double *rates, double *constants, dou algebraicVariables[1] = u[1]; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1] == constants[0]; computedConstants[1] = constants[1]/(constants[0] == constants[0]); diff --git a/tests/resources/coverage/generator/model.py b/tests/resources/coverage/generator/model.py index 2176333deb..55645126e5 100644 --- a/tests/resources/coverage/generator/model.py +++ b/tests/resources/coverage/generator/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -231,12 +231,12 @@ {"name": "eqnComputedConstant1", "units": "dimensionless", "component": "my_component"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "eqnNlaVariable2", "units": "dimensionless", "component": "my_component"}, {"name": "eqnNlaVariable1", "units": "dimensionless", "component": "my_component"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "eqnPlus", "units": "dimensionless", "component": "my_component"} ] @@ -419,7 +419,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[1] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = eq_func(constants[1], constants[0]) computed_constants[1] = constants[1]/eq_func(constants[0], constants[0]) computed_constants[2] = neq_func(constants[1], constants[0]) diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c index 8bf4f961ea..595770e21e 100644 --- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c +++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -20,7 +20,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"x", "dimensionless", "my_algebraic_eqn"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createConstantsArray() @@ -66,7 +66,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge computedConstants[0] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[1] = computedConstants[0]; } diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c index ff8bcd858b..cb3e48ed2f 100644 --- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c +++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -19,11 +19,11 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"x", "dimensionless", "my_algebraic_eqn"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"a", "dimensionless", "my_algebraic_eqn"} }; @@ -80,7 +80,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge { } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h index 26566dac75..0fc904c1e7 100644 --- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h +++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h @@ -20,8 +20,8 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -33,5 +33,5 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py index 259240b441..f22e51118e 100644 --- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py +++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -18,11 +18,11 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "x", "units": "dimensionless", "component": "my_algebraic_eqn"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "a", "units": "dimensionless", "component": "my_algebraic_eqn"} ] @@ -47,7 +47,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): pass -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h index bb6d32ca8b..3b19fd7c58 100644 --- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h +++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py index 20dbcfa056..3f9dae7d5d 100644 --- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py +++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -19,7 +19,7 @@ {"name": "x", "units": "dimensionless", "component": "my_algebraic_eqn"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -39,7 +39,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): computed_constants[0] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[1] = computed_constants[0] diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c index 1c3c778e5b..6c77c7e214 100644 --- a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c +++ b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 1; @@ -20,7 +20,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"x", "dimensionless", "my_algebraic_eqn"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createConstantsArray() @@ -66,7 +66,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge constants[0] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[0]; } diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h index bb6d32ca8b..3b19fd7c58 100644 --- a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h +++ b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py index 893bc667b4..bea37d5590 100644 --- a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py +++ b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 1 @@ -19,7 +19,7 @@ {"name": "x", "units": "dimensionless", "component": "my_algebraic_eqn"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -39,7 +39,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): constants[0] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[0] = constants[0] diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c index 978140be59..e5005e0430 100644 --- a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c +++ b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -19,7 +19,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"x", "dimensionless", "my_component"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createConstantsArray() @@ -65,7 +65,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge computedConstants[0] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h index ec98990597..ee4b2b2fab 100644 --- a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h +++ b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py index ce891673e8..fc8af4ae82 100644 --- a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py +++ b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -18,7 +18,7 @@ {"name": "x", "units": "dimensionless", "component": "my_component"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -38,7 +38,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): computed_constants[0] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c index d47ff38ea0..fc18809bee 100644 --- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c +++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "per_s", "my_ode"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"x", "per_s", "my_algebraic_eqn"} }; @@ -85,7 +85,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h index b04e145afc..69c13feccf 100644 --- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h +++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py index 01035f6042..3d68245dd3 100644 --- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py +++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ {"name": "a", "units": "per_s", "component": "my_ode"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "x", "units": "per_s", "component": "my_algebraic_eqn"} ] @@ -51,7 +51,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c index 10fe320c6b..4fe3fb76c2 100644 --- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c +++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "per_s", "my_component"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"x", "per_s", "my_component"} }; @@ -85,7 +85,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h index 94ce708793..54713b6b33 100644 --- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h +++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py index 22079d115f..6ce13496bd 100644 --- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py +++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ {"name": "a", "units": "per_s", "component": "my_component"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "x", "units": "per_s", "component": "my_component"} ] @@ -51,7 +51,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c index 87cc4b108a..c878a81517 100644 --- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c +++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "per_s", "my_ode"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"xx", "dimensionless", "my_algebraic_eqn"} }; @@ -85,7 +85,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h index 28cbf9e970..7a1675bc88 100644 --- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h +++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py index 24b1386bc9..86c8c1dda4 100644 --- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py +++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ {"name": "a", "units": "per_s", "component": "my_ode"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "xx", "units": "dimensionless", "component": "my_algebraic_eqn"} ] @@ -51,7 +51,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c index 51d0934973..d8f6ac1d6e 100644 --- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c +++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "per_s", "my_model"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"xx", "dimensionless", "my_model"} }; @@ -85,7 +85,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h index 91fd15c3d1..73458f268a 100644 --- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h +++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py index 225a95da37..52f7a474f7 100644 --- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py +++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ {"name": "a", "units": "per_s", "component": "my_model"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "xx", "units": "dimensionless", "component": "my_model"} ] @@ -51,7 +51,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c index 5d76e1c8df..cb934ab305 100644 --- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c +++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -21,7 +21,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"d", "dimensionless", "my_algebraic_eqn"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"a", "dimensionless", "my_algebraic_eqn"} }; @@ -103,7 +103,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge algebraicVariables[0] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c index 4d2556fd04..edfcf480e1 100644 --- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c +++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -21,11 +21,11 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"d", "dimensionless", "my_algebraic_eqn"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"a", "dimensionless", "my_algebraic_eqn"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"c", "dimensionless", "my_algebraic_eqn"} }; @@ -119,7 +119,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge algebraicVariables[0] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h index 26566dac75..0fc904c1e7 100644 --- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h +++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h @@ -20,8 +20,8 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -33,5 +33,5 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py index c07550e8da..137410f20b 100644 --- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py +++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -20,11 +20,11 @@ {"name": "d", "units": "dimensionless", "component": "my_algebraic_eqn"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "a", "units": "dimensionless", "component": "my_algebraic_eqn"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "c", "units": "dimensionless", "component": "my_algebraic_eqn"} ] @@ -75,7 +75,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): algebraicVariables[0] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h index bb6d32ca8b..3b19fd7c58 100644 --- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h +++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py index eec5b9b286..b7cd9e6724 100644 --- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py +++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -20,7 +20,7 @@ {"name": "d", "units": "dimensionless", "component": "my_algebraic_eqn"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "a", "units": "dimensionless", "component": "my_algebraic_eqn"} ] @@ -67,7 +67,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): algebraicVariables[0] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c index 2e57251d38..211c519eb5 100644 --- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c +++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -18,7 +18,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"z", "dimensionless", "my_algebraic_system"}, {"y", "dimensionless", "my_algebraic_system"}, {"x", "dimensionless", "my_algebraic_system"} @@ -109,7 +109,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge algebraicVariables[2] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.c b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.c index bd5abe872a..7f0f8b08a7 100644 --- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.c +++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -19,10 +19,10 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"z", "dimensionless", "my_algebraic_system"}, {"y", "dimensionless", "my_algebraic_system"}, {"x", "dimensionless", "my_algebraic_system"} @@ -81,7 +81,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge { } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.h b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.h index d52fe2527a..dd87fb08e3 100644 --- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.h +++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.h @@ -20,8 +20,8 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -33,5 +33,5 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.py b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.py index 9281341eaf..633bc3b2ae 100644 --- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.py +++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.external.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -18,10 +18,10 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "z", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "y", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"} @@ -48,7 +48,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): pass -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h index 25248242ea..619593dabd 100644 --- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h +++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py index d31e68c1de..56961247af 100644 --- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py +++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -17,7 +17,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "z", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "y", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"} @@ -73,7 +73,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): algebraicVariables[2] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c index 381aa4fbae..3719acdfed 100644 --- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c +++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 2; @@ -21,7 +21,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "dimensionless", "my_algebraic_system"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"c", "dimensionless", "my_algebraic_system"}, {"b", "dimensionless", "my_algebraic_system"}, {"d", "dimensionless", "my_algebraic_system"} @@ -109,7 +109,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge algebraicVariables[1] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = 3.0*constants[1]+constants[0]; } diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h index 25248242ea..619593dabd 100644 --- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h +++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py index bd237fa923..107f6cb161 100644 --- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py +++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 2 @@ -20,7 +20,7 @@ {"name": "a", "units": "dimensionless", "component": "my_algebraic_system"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "c", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "b", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "d", "units": "dimensionless", "component": "my_algebraic_system"} @@ -73,7 +73,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): algebraicVariables[1] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[0] = 3.0*constants[1]+constants[0] diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c index 7744f0b49e..5d18cb33cd 100644 --- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c +++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 2; @@ -21,7 +21,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "dimensionless", "my_algebraic_system"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"c", "dimensionless", "my_algebraic_system"}, {"b", "dimensionless", "my_algebraic_system"}, {"d", "dimensionless", "my_algebraic_system"} @@ -109,7 +109,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge algebraicVariables[1] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = 3.0*constants[1]+constants[0]; } diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h index 25248242ea..619593dabd 100644 --- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h +++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py index bd237fa923..107f6cb161 100644 --- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py +++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 2 @@ -20,7 +20,7 @@ {"name": "a", "units": "dimensionless", "component": "my_algebraic_system"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "c", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "b", "units": "dimensionless", "component": "my_algebraic_system"}, {"name": "d", "units": "dimensionless", "component": "my_algebraic_system"} @@ -73,7 +73,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): algebraicVariables[1] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[0] = 3.0*constants[1]+constants[0] diff --git a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c index 766d46c337..4755564e08 100644 --- a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c +++ b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -20,7 +20,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"y", "dimensionless", "my_component"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createConstantsArray() @@ -66,7 +66,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge computedConstants[0] = 1.0; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[1] = computedConstants[0]; } diff --git a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h index ec98990597..ee4b2b2fab 100644 --- a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h +++ b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py index 71ac8681ad..bfa1294768 100644 --- a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py +++ b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -19,7 +19,7 @@ {"name": "y", "units": "dimensionless", "component": "my_component"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -39,7 +39,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): computed_constants[0] = 1.0 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[1] = computed_constants[0] diff --git a/tests/resources/generator/cell_geometry_model/model.c b/tests/resources/generator/cell_geometry_model/model.c index cca5884ab1..93e47ba5ef 100644 --- a/tests/resources/generator/cell_geometry_model/model.c +++ b/tests/resources/generator/cell_geometry_model/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 2; @@ -22,7 +22,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"vss", "microlitre", "cell_geometry"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createConstantsArray() @@ -69,7 +69,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge constants[1] = 0.0011; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = 1000.0*3.14*constants[1]*constants[1]*constants[0]; computedConstants[1] = 0.02*computedConstants[0]; diff --git a/tests/resources/generator/cell_geometry_model/model.external.c b/tests/resources/generator/cell_geometry_model/model.external.c index 480f52c68b..5f470e3f1e 100644 --- a/tests/resources/generator/cell_geometry_model/model.external.c +++ b/tests/resources/generator/cell_geometry_model/model.external.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 0; @@ -19,12 +19,12 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"vcell", "microlitre", "cell_geometry"}, {"vss", "microlitre", "cell_geometry"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"L", "centimeter", "cell_geometry"}, {"rad", "centimeter", "cell_geometry"} }; @@ -82,7 +82,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge { } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cell_geometry_model/model.external.h b/tests/resources/generator/cell_geometry_model/model.external.h index 5ca6ded498..dd7f9ac1ea 100644 --- a/tests/resources/generator/cell_geometry_model/model.external.h +++ b/tests/resources/generator/cell_geometry_model/model.external.h @@ -20,8 +20,8 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -33,5 +33,5 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/cell_geometry_model/model.external.py b/tests/resources/generator/cell_geometry_model/model.external.py index 713e375877..ed56867266 100644 --- a/tests/resources/generator/cell_geometry_model/model.external.py +++ b/tests/resources/generator/cell_geometry_model/model.external.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 0 @@ -18,12 +18,12 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "vcell", "units": "microlitre", "component": "cell_geometry"}, {"name": "vss", "units": "microlitre", "component": "cell_geometry"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "L", "units": "centimeter", "component": "cell_geometry"}, {"name": "rad", "units": "centimeter", "component": "cell_geometry"} ] @@ -49,7 +49,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): pass -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cell_geometry_model/model.h b/tests/resources/generator/cell_geometry_model/model.h index ac83a1e382..ad56f2378a 100644 --- a/tests/resources/generator/cell_geometry_model/model.h +++ b/tests/resources/generator/cell_geometry_model/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cell_geometry_model/model.py b/tests/resources/generator/cell_geometry_model/model.py index 7194e27046..1351f43471 100644 --- a/tests/resources/generator/cell_geometry_model/model.py +++ b/tests/resources/generator/cell_geometry_model/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 2 @@ -21,7 +21,7 @@ {"name": "vss", "units": "microlitre", "component": "cell_geometry"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -42,7 +42,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): constants[1] = 0.0011 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[0] = 1000.0*3.14*constants[1]*constants[1]*constants[0] computed_constants[1] = 0.02*computed_constants[0] diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.c b/tests/resources/generator/cellml_mappings_and_encapsulations/model.c index 83aeb31558..0546c1ae57 100644 --- a/tests/resources/generator/cellml_mappings_and_encapsulations/model.c +++ b/tests/resources/generator/cellml_mappings_and_encapsulations/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"local_complex_maths", "mM", "circle_sibling"}, {"two_x", "milli_mole", "circle_x_sibling"} }; @@ -86,7 +86,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[1] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.h b/tests/resources/generator/cellml_mappings_and_encapsulations/model.h index a250c3ea6b..8c442a2345 100644 --- a/tests/resources/generator/cellml_mappings_and_encapsulations/model.h +++ b/tests/resources/generator/cellml_mappings_and_encapsulations/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.py b/tests/resources/generator/cellml_mappings_and_encapsulations/model.py index d9b9a9e4ed..03764674d1 100644 --- a/tests/resources/generator/cellml_mappings_and_encapsulations/model.py +++ b/tests/resources/generator/cellml_mappings_and_encapsulations/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "local_complex_maths", "units": "mM", "component": "circle_sibling"}, {"name": "two_x", "units": "milli_mole", "component": "circle_x_sibling"} ] @@ -52,7 +52,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[1] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_slc_example/model.py b/tests/resources/generator/cellml_slc_example/model.py index 846e029ad5..5bd69004fc 100644 --- a/tests/resources/generator/cellml_slc_example/model.py +++ b/tests/resources/generator/cellml_slc_example/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 9 @@ -27,7 +27,7 @@ {"name": "v", "units": "fmol_per_sec", "component": "SLC_template3_ss"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -55,7 +55,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): constants[8] = 1.1 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[0] = constants[8]*(constants[7]*constants[1]-constants[6]*constants[2])/(constants[5]*constants[2]+constants[4]*constants[1]+constants[3]*constants[2]*constants[1]+constants[0]) diff --git a/tests/resources/generator/cellml_state_initialised_using_variable/model.c b/tests/resources/generator/cellml_state_initialised_using_variable/model.c index cce19d5246..7e3fbe0ecc 100644 --- a/tests/resources/generator/cellml_state_initialised_using_variable/model.c +++ b/tests/resources/generator/cellml_state_initialised_using_variable/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[0] = constants[0]; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_state_initialised_using_variable/model.h b/tests/resources/generator/cellml_state_initialised_using_variable/model.h index 2e26a1fd89..80222fc392 100644 --- a/tests/resources/generator/cellml_state_initialised_using_variable/model.h +++ b/tests/resources/generator/cellml_state_initialised_using_variable/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_state_initialised_using_variable/model.py b/tests/resources/generator/cellml_state_initialised_using_variable/model.py index e2b042ce9f..dbcfb929ad 100644 --- a/tests/resources/generator/cellml_state_initialised_using_variable/model.py +++ b/tests/resources/generator/cellml_state_initialised_using_variable/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[0] = constants[0] -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.c b/tests/resources/generator/cellml_unit_scaling_constant/model.c index dc22819b2d..e0eb686531 100644 --- a/tests/resources/generator/cellml_unit_scaling_constant/model.c +++ b/tests/resources/generator/cellml_unit_scaling_constant/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 9; @@ -37,7 +37,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"comp_oc_M_M", "M", "main"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createConstantsArray() @@ -91,7 +91,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge constants[8] = constants[7]; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+constants[0]; computedConstants[1] = 0.001*constants[1]+0.001*constants[0]; diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.h b/tests/resources/generator/cellml_unit_scaling_constant/model.h index a183ef7413..331db407b2 100644 --- a/tests/resources/generator/cellml_unit_scaling_constant/model.h +++ b/tests/resources/generator/cellml_unit_scaling_constant/model.h @@ -19,7 +19,7 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -28,5 +28,5 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.py b/tests/resources/generator/cellml_unit_scaling_constant/model.py index f85680f559..91bae643f9 100644 --- a/tests/resources/generator/cellml_unit_scaling_constant/model.py +++ b/tests/resources/generator/cellml_unit_scaling_constant/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 9 @@ -36,7 +36,7 @@ {"name": "comp_oc_M_M", "units": "M", "component": "main"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -64,7 +64,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): constants[8] = constants[7] -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+constants[0] computed_constants[1] = 0.001*constants[1]+0.001*constants[0] computed_constants[2] = 1000.0*constants[3]+1000.0*constants[4] diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.c b/tests/resources/generator/cellml_unit_scaling_rate/model.c index 5c4e633af2..1015bbec56 100644 --- a/tests/resources/generator/cellml_unit_scaling_rate/model.c +++ b/tests/resources/generator/cellml_unit_scaling_rate/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -25,7 +25,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"x", "mM", "main"}, {"y", "M", "main"} }; @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[0] = 123.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.h b/tests/resources/generator/cellml_unit_scaling_rate/model.h index 2e26a1fd89..80222fc392 100644 --- a/tests/resources/generator/cellml_unit_scaling_rate/model.h +++ b/tests/resources/generator/cellml_unit_scaling_rate/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.py b/tests/resources/generator/cellml_unit_scaling_rate/model.py index 9b7d90ad85..760a375cfb 100644 --- a/tests/resources/generator/cellml_unit_scaling_rate/model.py +++ b/tests/resources/generator/cellml_unit_scaling_rate/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -24,7 +24,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "x", "units": "mM", "component": "main"}, {"name": "y", "units": "M", "component": "main"} ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[0] = 123.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.c b/tests/resources/generator/cellml_unit_scaling_state/model.c index 73d795648f..81e4b38931 100644 --- a/tests/resources/generator/cellml_unit_scaling_state/model.c +++ b/tests/resources/generator/cellml_unit_scaling_state/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -25,7 +25,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"x", "mM", "main"}, {"y", "M", "main"} }; @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[0] = 123.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.h b/tests/resources/generator/cellml_unit_scaling_state/model.h index 2e26a1fd89..80222fc392 100644 --- a/tests/resources/generator/cellml_unit_scaling_state/model.h +++ b/tests/resources/generator/cellml_unit_scaling_state/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.py b/tests/resources/generator/cellml_unit_scaling_state/model.py index b2454a768d..fbdcb253ee 100644 --- a/tests/resources/generator/cellml_unit_scaling_state/model.py +++ b/tests/resources/generator/cellml_unit_scaling_state/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -24,7 +24,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "x", "units": "mM", "component": "main"}, {"name": "y", "units": "M", "component": "main"} ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[0] = 123.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c index a65c53da8d..0e402b4a7b 100644 --- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c +++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[1] = 0.001*789.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h index d27f4f5e79..82cdcccd9a 100644 --- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h +++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py index d77590f172..82d337a3f5 100644 --- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py +++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[1] = 0.001*789.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c index a7d21b7c6e..1de42fdd11 100644 --- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c +++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -28,7 +28,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -88,7 +88,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[1] = 0.001*constants[1]; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h index 91b6f8df37..ecfa9e39bc 100644 --- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h +++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py index 61db6240c1..89708d6d25 100644 --- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py +++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -27,7 +27,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -54,7 +54,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[1] = 0.001*constants[1] -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c index 71e07eb6af..b0ab0097fd 100644 --- a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c +++ b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[1] = 5.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h index 77fc3ba738..4bb10bae7a 100644 --- a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h +++ b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py index d76c8c6612..98aa586a25 100644 --- a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py +++ b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[1] = 5.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c index f56b39c725..5500a99589 100644 --- a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c +++ b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 3; @@ -27,7 +27,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -86,7 +86,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[2] = 11.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h index 91d20c68ce..42d15c5db0 100644 --- a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h +++ b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py index 3e2a7e1c5c..604556993a 100644 --- a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py +++ b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 3 @@ -26,7 +26,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -52,7 +52,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[2] = 11.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/dae_cellml_1_1_model/model.c b/tests/resources/generator/dae_cellml_1_1_model/model.c index a5ebbb5eb3..37389a5ad0 100644 --- a/tests/resources/generator/dae_cellml_1_1_model/model.c +++ b/tests/resources/generator/dae_cellml_1_1_model/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -31,7 +31,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"v_1", "C_per_s", "main"}, {"v_2", "C_per_s", "main"}, {"u_3", "J_per_C", "main"}, @@ -165,7 +165,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[2] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/dae_cellml_1_1_model/model.h b/tests/resources/generator/dae_cellml_1_1_model/model.h index 3350366aef..91b551a51f 100644 --- a/tests/resources/generator/dae_cellml_1_1_model/model.h +++ b/tests/resources/generator/dae_cellml_1_1_model/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/dae_cellml_1_1_model/model.py b/tests/resources/generator/dae_cellml_1_1_model/model.py index e847325529..10c977c3cc 100644 --- a/tests/resources/generator/dae_cellml_1_1_model/model.py +++ b/tests/resources/generator/dae_cellml_1_1_model/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -30,7 +30,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "v_1", "units": "C_per_s", "component": "main"}, {"name": "v_2", "units": "C_per_s", "component": "main"}, {"name": "u_3", "units": "J_per_C", "component": "main"}, @@ -116,7 +116,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[2] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/dependent_eqns/model.c b/tests/resources/generator/dependent_eqns/model.c index 4764fb6529..114d43b2cc 100644 --- a/tests/resources/generator/dependent_eqns/model.c +++ b/tests/resources/generator/dependent_eqns/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -25,7 +25,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"b", "second", "my_component"}, {"a", "second", "my_component"} }; @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[0] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/dependent_eqns/model.h b/tests/resources/generator/dependent_eqns/model.h index 04fbb20712..394d05dcbf 100644 --- a/tests/resources/generator/dependent_eqns/model.h +++ b/tests/resources/generator/dependent_eqns/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/dependent_eqns/model.py b/tests/resources/generator/dependent_eqns/model.py index 9ffd00bc2c..fc8a72c66b 100644 --- a/tests/resources/generator/dependent_eqns/model.py +++ b/tests/resources/generator/dependent_eqns/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -24,7 +24,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "b", "units": "second", "component": "my_component"}, {"name": "a", "units": "second", "component": "my_component"} ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[0] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c index 2bb7d60aed..abb551173a 100644 --- a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c +++ b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 33; @@ -173,7 +173,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"alpha_a", "per_second", "i_KACh_a_gate"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"Nai", "millimolar", "Nai_concentration"}, {"E_Na", "millivolt", "Ionic_values"}, {"E_Ca", "millivolt", "Ionic_values"}, @@ -454,7 +454,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[90] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[62]*constants[61]/constants[6]; computedConstants[1] = computedConstants[0]*log(constants[4]/constants[3]); diff --git a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h index 3a126e50d8..7dcd725076 100644 --- a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h +++ b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py index 5dcdbd888a..650e0f13ef 100644 --- a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py +++ b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 33 @@ -172,7 +172,7 @@ {"name": "alpha_a", "units": "per_second", "component": "i_KACh_a_gate"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "Nai", "units": "millimolar", "component": "Nai_concentration"}, {"name": "E_Na", "units": "millivolt", "component": "Ionic_values"}, {"name": "E_Ca", "units": "millivolt", "component": "Ionic_values"}, @@ -440,7 +440,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[90] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[62]*constants[61]/constants[6] computed_constants[1] = computed_constants[0]*log(constants[4]/constants[3]) computed_constants[4] = 1.2 if gt_func(constants[1], 0.0) else 1.0 diff --git a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c index d3dd33e910..953cb29a83 100644 --- a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c +++ b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 15; @@ -172,7 +172,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"g_f_K", "microS", "hyperpolarisation_activated_current"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_p", "nanoA", "sodium_potassium_pump"}, {"i_NaCa", "nanoA", "sodium_calcium_exchanger"}, {"i_b_K", "nanoA", "potassium_background_current"}, @@ -405,7 +405,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[109] = 0.006875; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = (constants[1] == 0.0)?1.07*(3.0*constants[0]-0.1)/(3.0*(1.0+0.7745*exp(-(3.0*constants[0]-2.05)/0.295))):(constants[1] == 1.0)?constants[2]*constants[0]/(1.0+0.7745*exp(-(3.0*constants[0]-2.05)/0.295)):1.07*29.0*constants[0]/(30.0*(1.0+0.7745*exp(-(29.0*constants[0]-24.5)/1.95))); computedConstants[1] = constants[3]+computedConstants[0]*(constants[4]-constants[3]); diff --git a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h index 115dc54438..77adbc5cf6 100644 --- a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h +++ b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py index b7702ec72e..e1766c72cf 100644 --- a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py +++ b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 15 @@ -171,7 +171,7 @@ {"name": "g_f_K", "units": "microS", "component": "hyperpolarisation_activated_current"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_p", "units": "nanoA", "component": "sodium_potassium_pump"}, {"name": "i_NaCa", "units": "nanoA", "component": "sodium_calcium_exchanger"}, {"name": "i_b_K", "units": "nanoA", "component": "potassium_background_current"}, @@ -379,7 +379,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[109] = 0.006875 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = 1.07*(3.0*constants[0]-0.1)/(3.0*(1.0+0.7745*exp(-(3.0*constants[0]-2.05)/0.295))) if eq_func(constants[1], 0.0) else constants[2]*constants[0]/(1.0+0.7745*exp(-(3.0*constants[0]-2.05)/0.295)) if eq_func(constants[1], 1.0) else 1.07*29.0*constants[0]/(30.0*(1.0+0.7745*exp(-(29.0*constants[0]-24.5)/1.95))) computed_constants[1] = constants[3]+computed_constants[0]*(constants[4]-constants[3]) computed_constants[3] = constants[8]+computed_constants[0]*(constants[9]-constants[8]) if eq_func(constants[1], 0.0) else constants[12]+computed_constants[0]*(constants[13]-constants[12]) if eq_func(constants[1], 1.0) else constants[10]+computed_constants[0]*(constants[11]-constants[10]) diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c index df64cf0454..07f2fa3aaa 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -37,7 +37,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, {"i_Na", "microA_per_cm2", "sodium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"} }; @@ -126,7 +126,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py index 87c4c38f17..8718c033cb 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -36,7 +36,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"} ] @@ -97,7 +97,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c index 77bbfadd45..8e73a2f10b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -36,7 +36,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -111,7 +111,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c index dcd6f4146c..edaa0bfca9 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -36,7 +36,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"E_L", "millivolt", "leakage_current"} }; @@ -126,7 +126,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-115.0; computedConstants[1] = constants[1]+12.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py index 0b2ef3ca96..21d1e96a77 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -35,7 +35,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "E_L", "units": "millivolt", "component": "leakage_current"} ] @@ -97,7 +97,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-115.0 computed_constants[1] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c index cbb2ec3a0d..d0902df499 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -36,7 +36,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"Cm", "microF_per_cm2", "membrane"} }; @@ -125,7 +125,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[3] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[0]-10.613; computedConstants[1] = constants[0]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py index 4d168187cf..fd0852ee08 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -35,7 +35,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "Cm", "units": "microF_per_cm2", "component": "membrane"} ] @@ -96,7 +96,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[3] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[0]-10.613 computed_constants[1] = constants[0]-115.0 computed_constants[2] = constants[0]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c index f00efa362c..4d3897d112 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -33,7 +33,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -582,7 +582,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[12] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.c index 1386eb1962..ff1c30b10b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 3; @@ -33,7 +33,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -47,7 +47,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"}, {"V", "millivolt", "membrane"}, {"alpha_n", "per_millisecond", "potassium_channel_n_gate"} @@ -530,7 +530,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.py index 11a049b376..4d8b4e0a59 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.external.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 3 @@ -32,7 +32,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -46,7 +46,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"}, {"name": "V", "units": "millivolt", "component": "membrane"}, {"name": "alpha_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} @@ -449,7 +449,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.c index 1d492ef114..d630a514f1 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -34,7 +34,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -528,7 +528,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[11] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+12.0; } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.py index cf694f89f4..c3ac349187 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -33,7 +33,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -452,7 +452,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[11] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.c index 8d627701cc..ac00a31ea4 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -35,7 +35,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -531,7 +531,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+12.0; } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.py index 1a66369386..cefb0c4f16 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.control.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -34,7 +34,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -450,7 +450,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.c index 9f29da79ce..05adce4a1d 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -34,7 +34,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -529,7 +529,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+12.0; } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.py index a0d5e4799d..54cda15bb0 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -33,7 +33,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -453,7 +453,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.c index 2378daeb59..06bc05afbe 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -35,7 +35,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -531,7 +531,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+12.0; } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.py index 1a66369386..cefb0c4f16 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.algebraic.variables.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -34,7 +34,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -450,7 +450,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.c index 30b1053dfe..e737f95748 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -33,7 +33,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -529,7 +529,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[11] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.py index 8646765e45..05596b61cc 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -32,7 +32,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -453,7 +453,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[11] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.c index 10a0dfc657..c7d8e23e19 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -35,7 +35,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -531,7 +531,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+12.0; } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.py index 1a66369386..cefb0c4f16 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.computed.constants.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -34,7 +34,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -450,7 +450,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.c index 684ff78424..2dcdbcbdf4 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -29,7 +29,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -530,7 +530,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[11] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { double membrane_E_R = 0.0; computedConstants[0] = membrane_E_R+12.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.py index a4f28ae362..f0f818fcfa 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -28,7 +28,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -454,7 +454,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[11] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): membrane_E_R = 0.0 computed_constants[0] = membrane_E_R+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.c index 402b069e4e..4cc114bfa3 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -31,7 +31,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -45,7 +45,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -531,7 +531,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { double membrane_E_R = 0.0; computedConstants[0] = membrane_E_R+12.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.py index 2ba6ac0325..679c6da7c4 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.constants.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -30,7 +30,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -44,7 +44,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -450,7 +450,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): membrane_E_R = 0.0 computed_constants[0] = membrane_E_R+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.c index 7c27928bf9..7be2370d18 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -28,7 +28,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -532,7 +532,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.py index c45b1acbe3..3efd2a8adb 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -27,7 +27,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -456,7 +456,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.c index 01a6668049..ba30baae09 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -31,7 +31,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -45,7 +45,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -531,7 +531,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[10] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { double membrane_E_R = 0.0; computedConstants[0] = membrane_E_R+12.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.py index 2ba6ac0325..679c6da7c4 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.for.tracking.untracked.variables.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -30,7 +30,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -44,7 +44,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -450,7 +450,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[10] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): membrane_E_R = 0.0 computed_constants[0] = membrane_E_R+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py index 19e1d5d422..17f89ac7e8 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -32,7 +32,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -500,7 +500,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[12] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c index 8e4ccdb9c5..8a3bd0fc91 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -37,7 +37,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, {"i_Na", "microA_per_cm2", "sodium_channel"}, @@ -48,7 +48,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"alpha_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; @@ -126,7 +126,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py index e6db35ecf4..bc7a0e08c5 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -36,7 +36,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"}, @@ -47,7 +47,7 @@ {"name": "alpha_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] @@ -97,7 +97,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c index c3526688c3..f81a337a8f 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -33,7 +33,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -48,7 +48,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"E_R", "millivolt", "membrane"}, {"E_K", "millivolt", "potassium_channel"} }; @@ -125,7 +125,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[3] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py index 2d6d09a09a..fdad3e4924 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -32,7 +32,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -47,7 +47,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "E_R", "units": "millivolt", "component": "membrane"}, {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] @@ -96,7 +96,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[3] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c index 56cec3ef8c..ceb96eaf2c 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -35,7 +35,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -48,7 +48,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"Cm", "microF_per_cm2", "membrane"}, {"g_Na", "milliS_per_cm2", "sodium_channel"} }; @@ -124,7 +124,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[2] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[0]-10.613; computedConstants[1] = constants[0]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py index 0eecf8dae1..aee57033c9 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -34,7 +34,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -47,7 +47,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "Cm", "units": "microF_per_cm2", "component": "membrane"}, {"name": "g_Na", "units": "milliS_per_cm2", "component": "sodium_channel"} ] @@ -95,7 +95,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[2] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[0]-10.613 computed_constants[1] = constants[0]-115.0 computed_constants[2] = constants[0]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c index fda55001df..48a8ddb556 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -35,7 +35,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -48,7 +48,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"V", "millivolt", "membrane"}, {"m", "dimensionless", "sodium_channel_m_gate"} }; @@ -124,7 +124,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py index 090628993f..539d5767fd 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -34,7 +34,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -47,7 +47,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "V", "units": "millivolt", "component": "membrane"}, {"name": "m", "units": "dimensionless", "component": "sodium_channel_m_gate"} ] @@ -95,7 +95,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c index 247e8ff166..bd0de8aafd 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 3; @@ -36,7 +36,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -47,7 +47,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"}, {"V", "millivolt", "membrane"}, {"alpha_n", "per_millisecond", "potassium_channel_n_gate"} @@ -125,7 +125,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py index c3b13c212d..f227d78e09 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 3 @@ -35,7 +35,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -46,7 +46,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"}, {"name": "V", "units": "millivolt", "component": "membrane"}, {"name": "alpha_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} @@ -96,7 +96,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py index 296d6f267a..c8dd92cf24 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -35,7 +35,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -89,7 +89,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c index 0a34fbaff8..0fd4445fd3 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 3; @@ -36,7 +36,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -49,7 +49,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"m", "dimensionless", "sodium_channel_m_gate"} }; @@ -125,7 +125,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py index 8a869a934e..8391d46a13 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 3 @@ -35,7 +35,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -48,7 +48,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "m", "units": "dimensionless", "component": "sodium_channel_m_gate"} ] @@ -96,7 +96,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.c index 5916e75f6a..1281108d0b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -36,7 +36,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -101,7 +101,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.h index cfc013f3b9..6c399856f8 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.py index 970d2e57d0..73871d0cbe 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -35,7 +35,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -79,7 +79,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.c index ecfede2bd3..971788064a 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -37,11 +37,11 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"alpha_m", "per_millisecond", "sodium_channel_m_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -118,7 +118,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]-10.613; computedConstants[1] = constants[1]-115.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.py index cdc3538a43..d5a857b8a2 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.algebraic.variables.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -36,11 +36,11 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "alpha_m", "units": "per_millisecond", "component": "sodium_channel_m_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -89,7 +89,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]-10.613 computed_constants[1] = constants[1]-115.0 computed_constants[2] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.c index 1a0f8548c4..55c881fc9a 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -33,7 +33,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -108,7 +108,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.py index e08938232d..2a6d8b8a0e 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -32,7 +32,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -86,7 +86,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.c index db11b6482c..7c9fb8fc1e 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -35,7 +35,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -47,7 +47,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -124,7 +124,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 36.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = constants[1]+12.0; } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.py index 8121562c6b..c6d58757bf 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.computed.constants.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -34,7 +34,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -46,7 +46,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -95,7 +95,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 36.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = constants[1]+12.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.c index 43c8bf1c46..aab922c425 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -31,7 +31,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -101,7 +101,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[3] = 0.325; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { double membrane_E_R = 0.0; computedConstants[0] = membrane_E_R-10.613; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.h index 42166250cf..2ef580e613 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.py index 11b5db1733..4e436b10bc 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -30,7 +30,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -79,7 +79,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[3] = 0.325 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): membrane_E_R = 0.0 computed_constants[0] = membrane_E_R-10.613 computed_constants[1] = membrane_E_R-115.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.c index ea555fbb05..ae3599129e 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -33,7 +33,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Stim", "microA_per_cm2", "membrane"}, {"i_L", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, @@ -45,7 +45,7 @@ const VariableInfo ALGEBRAIC_INFO[] = { {"beta_n", "per_millisecond", "potassium_channel_n_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -118,7 +118,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { double membrane_E_R = 0.0; computedConstants[0] = membrane_E_R-10.613; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.py index 2ad0d6571d..18416f0307 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.constants.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -32,7 +32,7 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Stim", "units": "microA_per_cm2", "component": "membrane"}, {"name": "i_L", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, @@ -44,7 +44,7 @@ {"name": "beta_n", "units": "per_millisecond", "component": "potassium_channel_n_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -89,7 +89,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): membrane_E_R = 0.0 computed_constants[0] = membrane_E_R-10.613 computed_constants[1] = membrane_E_R-115.0 diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.c index 14eceb0628..1d4d949246 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -28,7 +28,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -88,7 +88,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[3] = 0.325; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.h index 48c35e85fd..95a2001427 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.py index 5d123acf25..806fd1dad5 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -27,7 +27,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -66,7 +66,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[3] = 0.325 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.c index af325fec97..bcbe9aff80 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.c +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -31,11 +31,11 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"E_K", "millivolt", "potassium_channel"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"alpha_m", "per_millisecond", "sodium_channel_m_gate"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"i_Na", "microA_per_cm2", "sodium_channel"} }; @@ -108,7 +108,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { double membrane_E_R = 0.0; computedConstants[0] = membrane_E_R+12.0; diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.h index ce60577280..d4d575667b 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.h +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.h @@ -23,8 +23,8 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -37,6 +37,6 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.py index 417ff539b2..e6f221fc94 100644 --- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.py +++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.untracked.variables.with.externals.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -30,11 +30,11 @@ {"name": "E_K", "units": "millivolt", "component": "potassium_channel"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "alpha_m", "units": "per_millisecond", "component": "sodium_channel_m_gate"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"} ] @@ -79,7 +79,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): membrane_E_R = 0.0 computed_constants[0] = membrane_E_R+12.0 diff --git a/tests/resources/generator/noble_model_1962/model.c b/tests/resources/generator/noble_model_1962/model.c index 478d6313bc..465587b451 100644 --- a/tests/resources/generator/noble_model_1962/model.c +++ b/tests/resources/generator/noble_model_1962/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 4; @@ -33,7 +33,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"i_Leak", "microA_per_cm2", "leakage_current"}, {"i_K", "microA_per_cm2", "potassium_channel"}, {"i_Na", "microA_per_cm2", "sodium_channel"}, @@ -110,7 +110,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[4] = 40.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/noble_model_1962/model.h b/tests/resources/generator/noble_model_1962/model.h index ab8a773bde..30dfb4d537 100644 --- a/tests/resources/generator/noble_model_1962/model.h +++ b/tests/resources/generator/noble_model_1962/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/noble_model_1962/model.py b/tests/resources/generator/noble_model_1962/model.py index 364e1e0aa0..cdeadbbb86 100644 --- a/tests/resources/generator/noble_model_1962/model.py +++ b/tests/resources/generator/noble_model_1962/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 4 @@ -32,7 +32,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "i_Leak", "units": "microA_per_cm2", "component": "leakage_current"}, {"name": "i_K", "units": "microA_per_cm2", "component": "potassium_channel"}, {"name": "i_Na", "units": "microA_per_cm2", "component": "sodium_channel"}, @@ -76,7 +76,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[4] = 40.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_computed_var_on_rhs/model.c b/tests/resources/generator/ode_computed_var_on_rhs/model.c index fcc7ff2038..98ebeca610 100644 --- a/tests/resources/generator/ode_computed_var_on_rhs/model.c +++ b/tests/resources/generator/ode_computed_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "per_s", "my_ode"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_computed_var_on_rhs/model.h b/tests/resources/generator/ode_computed_var_on_rhs/model.h index 77fc3ba738..4bb10bae7a 100644 --- a/tests/resources/generator/ode_computed_var_on_rhs/model.h +++ b/tests/resources/generator/ode_computed_var_on_rhs/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_computed_var_on_rhs/model.py b/tests/resources/generator/ode_computed_var_on_rhs/model.py index df9a63a657..ea6daea8f0 100644 --- a/tests/resources/generator/ode_computed_var_on_rhs/model.py +++ b/tests/resources/generator/ode_computed_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ {"name": "a", "units": "per_s", "component": "my_ode"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c index 1cfd3811ef..1b08d85583 100644 --- a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c +++ b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"a", "per_s", "my_component"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h index 94ce708793..54713b6b33 100644 --- a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h +++ b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py index a168ec78d0..125f61a8ce 100644 --- a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py +++ b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ {"name": "a", "units": "per_s", "component": "my_component"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_const_var_on_rhs/model.c b/tests/resources/generator/ode_const_var_on_rhs/model.c index aa63c71a80..b20b3f4c7c 100644 --- a/tests/resources/generator/ode_const_var_on_rhs/model.c +++ b/tests/resources/generator/ode_const_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_const_var_on_rhs/model.h b/tests/resources/generator/ode_const_var_on_rhs/model.h index 77fc3ba738..4bb10bae7a 100644 --- a/tests/resources/generator/ode_const_var_on_rhs/model.h +++ b/tests/resources/generator/ode_const_var_on_rhs/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_const_var_on_rhs/model.py b/tests/resources/generator/ode_const_var_on_rhs/model.py index 9b8635746f..0c839fd808 100644 --- a/tests/resources/generator/ode_const_var_on_rhs/model.py +++ b/tests/resources/generator/ode_const_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c index 91ff04853c..d8dd9a952e 100644 --- a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c +++ b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h index 94ce708793..54713b6b33 100644 --- a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h +++ b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py index fefb2b70e8..96d25ccf96 100644 --- a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py +++ b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_constant_on_rhs/model.c b/tests/resources/generator/ode_constant_on_rhs/model.c index dbc6d14ed1..e274d7be60 100644 --- a/tests/resources/generator/ode_constant_on_rhs/model.c +++ b/tests/resources/generator/ode_constant_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -25,7 +25,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -82,7 +82,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_constant_on_rhs/model.h b/tests/resources/generator/ode_constant_on_rhs/model.h index 77fc3ba738..4bb10bae7a 100644 --- a/tests/resources/generator/ode_constant_on_rhs/model.h +++ b/tests/resources/generator/ode_constant_on_rhs/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_constant_on_rhs/model.py b/tests/resources/generator/ode_constant_on_rhs/model.py index f449931630..650d845557 100644 --- a/tests/resources/generator/ode_constant_on_rhs/model.py +++ b/tests/resources/generator/ode_constant_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -24,7 +24,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -48,7 +48,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_constant_on_rhs_one_component/model.c b/tests/resources/generator/ode_constant_on_rhs_one_component/model.c index 501d294873..ef56643654 100644 --- a/tests/resources/generator/ode_constant_on_rhs_one_component/model.c +++ b/tests/resources/generator/ode_constant_on_rhs_one_component/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -25,7 +25,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -82,7 +82,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_constant_on_rhs_one_component/model.h b/tests/resources/generator/ode_constant_on_rhs_one_component/model.h index 94ce708793..54713b6b33 100644 --- a/tests/resources/generator/ode_constant_on_rhs_one_component/model.h +++ b/tests/resources/generator/ode_constant_on_rhs_one_component/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_constant_on_rhs_one_component/model.py b/tests/resources/generator/ode_constant_on_rhs_one_component/model.py index 7ceec19df2..bb5ce476c9 100644 --- a/tests/resources/generator/ode_constant_on_rhs_one_component/model.py +++ b/tests/resources/generator/ode_constant_on_rhs_one_component/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -24,7 +24,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -48,7 +48,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.c b/tests/resources/generator/ode_multiple_dependent_odes/model.c index fccb0c0fd9..2d8b9bd95f 100644 --- a/tests/resources/generator/ode_multiple_dependent_odes/model.c +++ b/tests/resources/generator/ode_multiple_dependent_odes/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -27,7 +27,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -86,7 +86,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.h b/tests/resources/generator/ode_multiple_dependent_odes/model.h index 990b801abf..25a89c8c95 100644 --- a/tests/resources/generator/ode_multiple_dependent_odes/model.h +++ b/tests/resources/generator/ode_multiple_dependent_odes/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.py b/tests/resources/generator/ode_multiple_dependent_odes/model.py index 3a6e551806..d998fb0969 100644 --- a/tests/resources/generator/ode_multiple_dependent_odes/model.py +++ b/tests/resources/generator/ode_multiple_dependent_odes/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -26,7 +26,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -52,7 +52,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c index 8bf0e0c152..eb955fd1bc 100644 --- a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c +++ b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -27,7 +27,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -86,7 +86,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h index 1e0a626c61..b599f6b2d0 100644 --- a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h +++ b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py index 63bfb2913e..5616a22a4e 100644 --- a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py +++ b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -26,7 +26,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -52,7 +52,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_multiple_odes_with_same_name/model.c b/tests/resources/generator/ode_multiple_odes_with_same_name/model.c index 6c51205d84..ec5ced8b7e 100644 --- a/tests/resources/generator/ode_multiple_odes_with_same_name/model.c +++ b/tests/resources/generator/ode_multiple_odes_with_same_name/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -27,7 +27,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -86,7 +86,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_multiple_odes_with_same_name/model.h b/tests/resources/generator/ode_multiple_odes_with_same_name/model.h index b31ed3b01d..21f4f64aea 100644 --- a/tests/resources/generator/ode_multiple_odes_with_same_name/model.h +++ b/tests/resources/generator/ode_multiple_odes_with_same_name/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_multiple_odes_with_same_name/model.py b/tests/resources/generator/ode_multiple_odes_with_same_name/model.py index 1eb1dc56ed..82aa5eaaca 100644 --- a/tests/resources/generator/ode_multiple_odes_with_same_name/model.py +++ b/tests/resources/generator/ode_multiple_odes_with_same_name/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -26,7 +26,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -52,7 +52,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/ode_unknown_var_on_rhs/model.c b/tests/resources/generator/ode_unknown_var_on_rhs/model.c index 0c5cd74ca9..d651deadb5 100644 --- a/tests/resources/generator/ode_unknown_var_on_rhs/model.c +++ b/tests/resources/generator/ode_unknown_var_on_rhs/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -26,7 +26,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { }; double * createStatesArray() @@ -84,7 +84,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * states[1] = 1.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/ode_unknown_var_on_rhs/model.h b/tests/resources/generator/ode_unknown_var_on_rhs/model.h index 77fc3ba738..4bb10bae7a 100644 --- a/tests/resources/generator/ode_unknown_var_on_rhs/model.h +++ b/tests/resources/generator/ode_unknown_var_on_rhs/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/ode_unknown_var_on_rhs/model.py b/tests/resources/generator/ode_unknown_var_on_rhs/model.py index 58b203c3a8..932e6f07a6 100644 --- a/tests/resources/generator/ode_unknown_var_on_rhs/model.py +++ b/tests/resources/generator/ode_unknown_var_on_rhs/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -25,7 +25,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ ] @@ -50,7 +50,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va states[1] = 1.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/robertson_model_1966/model.dae.c b/tests/resources/generator/robertson_model_1966/model.dae.c index a9d620fdb7..0a57824a3b 100644 --- a/tests/resources/generator/robertson_model_1966/model.dae.c +++ b/tests/resources/generator/robertson_model_1966/model.dae.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 2; @@ -29,7 +29,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"y3", "dimensionless", "main"}, {"y2_scaled", "dimensionless", "main"} }; @@ -131,7 +131,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[0] = 0.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/robertson_model_1966/model.dae.h b/tests/resources/generator/robertson_model_1966/model.dae.h index e0920c811f..8a99015cbe 100644 --- a/tests/resources/generator/robertson_model_1966/model.dae.h +++ b/tests/resources/generator/robertson_model_1966/model.dae.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/robertson_model_1966/model.dae.py b/tests/resources/generator/robertson_model_1966/model.dae.py index 464d0d2c85..4c8ad1eb68 100644 --- a/tests/resources/generator/robertson_model_1966/model.dae.py +++ b/tests/resources/generator/robertson_model_1966/model.dae.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 2 @@ -28,7 +28,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "y3", "units": "dimensionless", "component": "main"}, {"name": "y2_scaled", "units": "dimensionless", "component": "main"} ] @@ -85,7 +85,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[0] = 0.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/robertson_model_1966/model.ode.c b/tests/resources/generator/robertson_model_1966/model.ode.c index d6d2380c0f..48a1714867 100644 --- a/tests/resources/generator/robertson_model_1966/model.ode.c +++ b/tests/resources/generator/robertson_model_1966/model.ode.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 3; @@ -30,7 +30,7 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"y2_scaled", "dimensionless", "main"} }; @@ -93,7 +93,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[2] = 3.0e7; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/robertson_model_1966/model.ode.h b/tests/resources/generator/robertson_model_1966/model.ode.h index e0920c811f..8a99015cbe 100644 --- a/tests/resources/generator/robertson_model_1966/model.ode.h +++ b/tests/resources/generator/robertson_model_1966/model.ode.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/robertson_model_1966/model.ode.py b/tests/resources/generator/robertson_model_1966/model.ode.py index beabee9145..e9fd0db696 100644 --- a/tests/resources/generator/robertson_model_1966/model.ode.py +++ b/tests/resources/generator/robertson_model_1966/model.ode.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 3 @@ -29,7 +29,7 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "y2_scaled", "units": "dimensionless", "component": "main"} ] @@ -59,7 +59,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[2] = 3.0e7 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/sine_model_imports/model.c b/tests/resources/generator/sine_model_imports/model.c index 5eb541fa9a..92eac1c77d 100644 --- a/tests/resources/generator/sine_model_imports/model.c +++ b/tests/resources/generator/sine_model_imports/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 1; @@ -32,7 +32,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"kPi_32", "dimensionless", "parabolic_approx_sin"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"sin", "dimensionless", "actual_sin"}, {"sin", "dimensionless", "parabolic_approx_sin"}, {"z", "dimensionless", "parabolic_approx_sin"} @@ -99,7 +99,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[4] = 3.0*3.14159265358979/2.0; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/sine_model_imports/model.h b/tests/resources/generator/sine_model_imports/model.h index bdf3686481..99ded8f02d 100644 --- a/tests/resources/generator/sine_model_imports/model.h +++ b/tests/resources/generator/sine_model_imports/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/sine_model_imports/model.py b/tests/resources/generator/sine_model_imports/model.py index 635b0ebad6..f669d9c6f7 100644 --- a/tests/resources/generator/sine_model_imports/model.py +++ b/tests/resources/generator/sine_model_imports/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 1 @@ -31,7 +31,7 @@ {"name": "kPi_32", "units": "dimensionless", "component": "parabolic_approx_sin"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "sin", "units": "dimensionless", "component": "actual_sin"}, {"name": "sin", "units": "dimensionless", "component": "parabolic_approx_sin"}, {"name": "z", "units": "dimensionless", "component": "parabolic_approx_sin"} @@ -69,7 +69,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[4] = 3.0*3.14159265358979/2.0 -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/unknown_variable_as_external_variable/model.c b/tests/resources/generator/unknown_variable_as_external_variable/model.c index 59259bcc54..719b22056c 100644 --- a/tests/resources/generator/unknown_variable_as_external_variable/model.c +++ b/tests/resources/generator/unknown_variable_as_external_variable/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t CONSTANT_COUNT = 8; @@ -27,11 +27,11 @@ const VariableInfo CONSTANT_INFO[] = { const VariableInfo COMPUTED_CONSTANT_INFO[] = { }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"v", "fmol_per_sec", "SLC_template3_ss"} }; -const VariableInfo EXTERNAL_INFO[] = { +const VariableInfo EXTERNAL_VARIABLE_INFO[] = { {"P_3", "per_fmol_sec3", "SLC_template3_ss"} }; @@ -96,7 +96,7 @@ void initialiseArrays(double *constants, double *computedConstants, double *alge constants[7] = 1.1; } -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables) { } diff --git a/tests/resources/generator/unknown_variable_as_external_variable/model.h b/tests/resources/generator/unknown_variable_as_external_variable/model.h index 75c0733e28..f974d9cf27 100644 --- a/tests/resources/generator/unknown_variable_as_external_variable/model.h +++ b/tests/resources/generator/unknown_variable_as_external_variable/model.h @@ -20,8 +20,8 @@ typedef struct { extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; -extern const VariableInfo EXTERNAL_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; +extern const VariableInfo EXTERNAL_VARIABLE_INFO[]; double * createConstantsArray(); double * createComputedConstantsArray(); @@ -33,5 +33,5 @@ void deleteArray(double *array); typedef double (* ExternalVariable)(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, size_t index); void initialiseArrays(double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double *constants, double *computedConstants, double *algebraicVariables, double *externalVariables, ExternalVariable externalVariable); diff --git a/tests/resources/generator/unknown_variable_as_external_variable/model.py b/tests/resources/generator/unknown_variable_as_external_variable/model.py index 6e488c8044..6921502ce9 100644 --- a/tests/resources/generator/unknown_variable_as_external_variable/model.py +++ b/tests/resources/generator/unknown_variable_as_external_variable/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" CONSTANT_COUNT = 8 @@ -26,11 +26,11 @@ COMPUTED_CONSTANT_INFO = [ ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "v", "units": "fmol_per_sec", "component": "SLC_template3_ss"} ] -EXTERNAL_INFO = [ +EXTERNAL_VARIABLE_INFO = [ {"name": "P_3", "units": "per_fmol_sec3", "component": "SLC_template3_ss"} ] @@ -62,7 +62,7 @@ def initialise_arrays(constants, computed_constants, algebraic_variables): constants[7] = 1.1 -def compute_computed_constants(constants, computed_constants, algebraic): +def compute_computed_constants(constants, computed_constants, algebraic_variables): pass diff --git a/tests/resources/generator/variable_initialised_using_another_variable/model.c b/tests/resources/generator/variable_initialised_using_another_variable/model.c index 69f212522a..5d7677310c 100644 --- a/tests/resources/generator/variable_initialised_using_another_variable/model.c +++ b/tests/resources/generator/variable_initialised_using_another_variable/model.c @@ -5,7 +5,7 @@ #include #include -const char VERSION[] = "0.7.0"; +const char VERSION[] = "0.8.0"; const char LIBCELLML_VERSION[] = "0.6.3"; const size_t STATE_COUNT = 22; @@ -50,7 +50,7 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = { {"kNlaCompCst", "dimensionless", "main"} }; -const VariableInfo ALGEBRAIC_INFO[] = { +const VariableInfo ALGEBRAIC_VARIABLE_INFO[] = { {"xNlaStateCst", "dimensionless", "main"}, {"xNlaStateCompCst", "dimensionless", "main"}, {"xNlaStateState", "dimensionless", "main"}, @@ -748,7 +748,7 @@ void initialiseArrays(double *states, double *rates, double *constants, double * algebraicVariables[20] = algebraicVariables[21]; } -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic) +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { computedConstants[0] = 1.23*constants[0]; states[3] = computedConstants[0]; diff --git a/tests/resources/generator/variable_initialised_using_another_variable/model.h b/tests/resources/generator/variable_initialised_using_another_variable/model.h index da5835c729..48447600a0 100644 --- a/tests/resources/generator/variable_initialised_using_another_variable/model.h +++ b/tests/resources/generator/variable_initialised_using_another_variable/model.h @@ -22,7 +22,7 @@ extern const VariableInfo VOI_INFO; extern const VariableInfo STATE_INFO[]; extern const VariableInfo CONSTANT_INFO[]; extern const VariableInfo COMPUTED_CONSTANT_INFO[]; -extern const VariableInfo ALGEBRAIC_INFO[]; +extern const VariableInfo ALGEBRAIC_VARIABLE_INFO[]; double * createStatesArray(); double * createConstantsArray(); @@ -32,6 +32,6 @@ double * createAlgebraicVariablesArray(); void deleteArray(double *array); void initialiseArrays(double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); -void computeComputedConstants(double *states, double *rates, double *constants, double *computedConstants, double *algebraic); +void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeRates(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables); diff --git a/tests/resources/generator/variable_initialised_using_another_variable/model.py b/tests/resources/generator/variable_initialised_using_another_variable/model.py index 3c6dab99a1..a424d8a39d 100644 --- a/tests/resources/generator/variable_initialised_using_another_variable/model.py +++ b/tests/resources/generator/variable_initialised_using_another_variable/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.6.0" +__version__ = "0.7.0" LIBCELLML_VERSION = "0.6.3" STATE_COUNT = 22 @@ -49,7 +49,7 @@ {"name": "kNlaCompCst", "units": "dimensionless", "component": "main"} ] -ALGEBRAIC_INFO = [ +ALGEBRAIC_VARIABLE_INFO = [ {"name": "xNlaStateCst", "units": "dimensionless", "component": "main"}, {"name": "xNlaStateCompCst", "units": "dimensionless", "component": "main"}, {"name": "xNlaStateState", "units": "dimensionless", "component": "main"}, @@ -639,7 +639,7 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va algebraicVariables[20] = algebraicVariables[21] -def compute_computed_constants(states, rates, constants, computed_constants, algebraic): +def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): computed_constants[0] = 1.23*constants[0] states[3] = computed_constants[0] states[2] = states[3]