diff --git a/src/analyser.cpp b/src/analyser.cpp index 1c3594e124..58f1dfaf01 100644 --- a/src/analyser.cpp +++ b/src/analyser.cpp @@ -1620,11 +1620,8 @@ double Analyser::AnalyserImpl::powerValue(const AnalyserEquationAstPtr &ast, return 1.0; case AnalyserEquationAst::Type::FALSE: return 0.0; - case AnalyserEquationAst::Type::E: { - static const double E = exp(1.0); - - return E; - } + case AnalyserEquationAst::Type::E: + return M_E; case AnalyserEquationAst::Type::PI: return M_PI; case AnalyserEquationAst::Type::INF: { diff --git a/src/generatorprofile.cpp b/src/generatorprofile.cpp index 9fdfbc3484..d77036aed5 100644 --- a/src/generatorprofile.cpp +++ b/src/generatorprofile.cpp @@ -14,14 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -#ifdef _WIN32 -# define _USE_MATH_DEFINES -#endif - #include "libcellml/generatorprofile.h" -#include - #include "generatorprofile_p.h" #include "utilities.h" @@ -123,8 +117,8 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi mTrueString = "1.0"; mFalseString = "0.0"; - mEString = convertToString(exp(1.0)); - mPiString = convertToString(M_PI); + mEString = "2.7182818284590452"; + mPiString = "3.1415926535897932"; mInfString = "INFINITY"; mNanString = "NAN"; @@ -225,7 +219,7 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "#include \n"; mInterfaceVersionString = "extern const char VERSION[];\n"; - mImplementationVersionString = "const char VERSION[] = \"0.8.0\";\n"; + mImplementationVersionString = "const char VERSION[] = \"0.8.1\";\n"; mInterfaceLibcellmlVersionString = "extern const char LIBCELLML_VERSION[];\n"; mImplementationLibcellmlVersionString = "const char LIBCELLML_VERSION[] = \"[LIBCELLML_VERSION]\";\n"; @@ -639,8 +633,8 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi mTrueString = "1.0"; mFalseString = "0.0"; - mEString = convertToString(exp(1.0)); - mPiString = convertToString(M_PI); + mEString = "2.7182818284590452"; + mPiString = "3.1415926535897932"; mInfString = "inf"; mNanString = "nan"; @@ -741,7 +735,7 @@ void GeneratorProfile::GeneratorProfileImpl::loadProfile(GeneratorProfile::Profi "\n"; mInterfaceVersionString = ""; - mImplementationVersionString = "__version__ = \"0.8.0\"\n"; + mImplementationVersionString = "__version__ = \"0.8.1\"\n"; mInterfaceLibcellmlVersionString = ""; mImplementationLibcellmlVersionString = "LIBCELLML_VERSION = \"[LIBCELLML_VERSION]\"\n"; diff --git a/src/generatorprofilesha1values.h b/src/generatorprofilesha1values.h index 5817f6213c..e3a1ee2dca 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[] = "949c36b0108bc8cf9f41ff563f9ec1369d399a7c"; -static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "1f277b0e20a102ae0b63b63383cf4c0606f28034"; +static const char C_GENERATOR_PROFILE_SHA1[] = "4dc18688db4d0e306b35c54e0239153fee9f2104"; +static const char PYTHON_GENERATOR_PROFILE_SHA1[] = "54919955bccbbeaf019519cd600bc0f0deade5c3"; } // namespace libcellml diff --git a/tests/bindings/python/test_generator_profile.py b/tests/bindings/python/test_generator_profile.py index 6e0ace69a3..8631c4d44b 100644 --- a/tests/bindings/python/test_generator_profile.py +++ b/tests/bindings/python/test_generator_profile.py @@ -491,7 +491,7 @@ def test_e_string(self): g = GeneratorProfile() - self.assertEqual('2.71828182845905', g.eString()) + self.assertEqual('2.7182818284590452', g.eString()) g.setEString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.eString()) @@ -949,7 +949,7 @@ def test_implementation_version_string(self): g = GeneratorProfile() - self.assertEqual('const char VERSION[] = "0.8.0";\n', g.implementationVersionString()) + self.assertEqual('const char VERSION[] = "0.8.1";\n', g.implementationVersionString()) g.setImplementationVersionString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.implementationVersionString()) @@ -1432,7 +1432,7 @@ def test_pi_string(self): g = GeneratorProfile() - self.assertEqual('3.14159265358979', g.piString()) + self.assertEqual('3.1415926535897932', g.piString()) g.setPiString(GeneratorProfileTestCase.VALUE) self.assertEqual(GeneratorProfileTestCase.VALUE, g.piString()) diff --git a/tests/generator/generatorprofile.cpp b/tests/generator/generatorprofile.cpp index b2e3e1337c..10ccc2240e 100644 --- a/tests/generator/generatorprofile.cpp +++ b/tests/generator/generatorprofile.cpp @@ -143,8 +143,8 @@ TEST(GeneratorProfile, defaultConstantValues) EXPECT_EQ("1.0", generatorProfile->trueString()); EXPECT_EQ("0.0", generatorProfile->falseString()); - EXPECT_EQ(convertToString(exp(1.0)), generatorProfile->eString()); - EXPECT_EQ(convertToString(M_PI), generatorProfile->piString()); + EXPECT_EQ("2.7182818284590452", generatorProfile->eString()); + EXPECT_EQ("3.1415926535897932", generatorProfile->piString()); EXPECT_EQ("INFINITY", generatorProfile->infString()); EXPECT_EQ("NAN", generatorProfile->nanString()); } @@ -271,7 +271,7 @@ TEST(GeneratorProfile, defaultMiscellaneousValues) generatorProfile->implementationHeaderString()); EXPECT_EQ("extern const char VERSION[];\n", generatorProfile->interfaceVersionString()); - EXPECT_EQ("const char VERSION[] = \"0.8.0\";\n", generatorProfile->implementationVersionString()); + EXPECT_EQ("const char VERSION[] = \"0.8.1\";\n", generatorProfile->implementationVersionString()); EXPECT_EQ("extern const char LIBCELLML_VERSION[];\n", generatorProfile->interfaceLibcellmlVersionString()); EXPECT_EQ("const char LIBCELLML_VERSION[] = \"[LIBCELLML_VERSION]\";\n", generatorProfile->implementationLibcellmlVersionString()); diff --git a/tests/resources/coverage/generator/model.c b/tests/resources/coverage/generator/model.c index b1b0795efa..600001d1c4 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; @@ -442,8 +442,8 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[179] = 123.456789e99; computedConstants[181] = 1.0; computedConstants[182] = 0.0; - computedConstants[183] = 2.71828182845905; - computedConstants[184] = 3.14159265358979; + computedConstants[183] = 2.7182818284590452; + computedConstants[184] = 3.1415926535897932; computedConstants[185] = INFINITY; computedConstants[186] = NAN; computedConstants[198] = 1.0; diff --git a/tests/resources/coverage/generator/model.implementation.out b/tests/resources/coverage/generator/model.implementation.out index b41efa29ce..5bc6b0daf1 100644 --- a/tests/resources/coverage/generator/model.implementation.out +++ b/tests/resources/coverage/generator/model.implementation.out @@ -201,8 +201,8 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[179] = 123.456789e99; computedConstants[181] = 1.0; computedConstants[182] = 0.0; - computedConstants[183] = 2.71828182845905; - computedConstants[184] = 3.14159265358979; + computedConstants[183] = 2.7182818284590452; + computedConstants[184] = 3.1415926535897932; computedConstants[185] = INFINITY; computedConstants[186] = NAN; computedConstants[198] = 1.0; diff --git a/tests/resources/coverage/generator/model.modified.profile.c b/tests/resources/coverage/generator/model.modified.profile.c index dfdb09b082..4d09b0cf35 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.8.0.post0"; +const char VERSION[] = "0.8.1.post0"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; @@ -442,8 +442,8 @@ void initialiseArrays(double *states, double *rates, double *constants, double * computedConstants[179] = 123.456789e99; computedConstants[181] = 1.0; computedConstants[182] = 0.0; - computedConstants[183] = 2.71828182845905; - computedConstants[184] = 3.14159265358979; + computedConstants[183] = 2.7182818284590452; + computedConstants[184] = 3.1415926535897932; computedConstants[185] = INFINITY; computedConstants[186] = NAN; computedConstants[198] = 1.0; diff --git a/tests/resources/coverage/generator/model.modified.profile.py b/tests/resources/coverage/generator/model.modified.profile.py index 2f064695b0..f2a8467787 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.8.0.post0" +__version__ = "0.8.1.post0" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 @@ -409,8 +409,8 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[179] = 123.456789e99 computed_constants[181] = 1.0 computed_constants[182] = 0.0 - computed_constants[183] = 2.71828182845905 - computed_constants[184] = 3.14159265358979 + computed_constants[183] = 2.7182818284590452 + computed_constants[184] = 3.1415926535897932 computed_constants[185] = inf computed_constants[186] = nan computed_constants[198] = 1.0 diff --git a/tests/resources/coverage/generator/model.no.tracking.c b/tests/resources/coverage/generator/model.no.tracking.c index e03552ae4f..27363b3f38 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; @@ -211,8 +211,8 @@ void initialiseArrays(double *states, double *rates, double *constants, double * double my_component_eqnCnDoubleWithExponent = 123.456789e99; double my_component_eqnTrue = 1.0; double my_component_eqnFalse = 0.0; - double my_component_eqnExponentiale = 2.71828182845905; - double my_component_eqnPi = 3.14159265358979; + double my_component_eqnExponentiale = 2.7182818284590452; + double my_component_eqnPi = 3.1415926535897932; double my_component_eqnInfinity = INFINITY; double my_component_eqnNotanumber = NAN; double my_component_eqnComputedConstant1 = 1.0; diff --git a/tests/resources/coverage/generator/model.py b/tests/resources/coverage/generator/model.py index d3db9cff23..eda9eccd76 100644 --- a/tests/resources/coverage/generator/model.py +++ b/tests/resources/coverage/generator/model.py @@ -4,7 +4,7 @@ from math import * -__version__ = "0.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 @@ -409,8 +409,8 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va computed_constants[179] = 123.456789e99 computed_constants[181] = 1.0 computed_constants[182] = 0.0 - computed_constants[183] = 2.71828182845905 - computed_constants[184] = 3.14159265358979 + computed_constants[183] = 2.7182818284590452 + computed_constants[184] = 3.1415926535897932 computed_constants[185] = inf computed_constants[186] = nan computed_constants[198] = 1.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 6270e76ab0..272e95acee 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 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 aadf6e2cbb..af9611ad21 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 b9ad774952..3b001ec220 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 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 f57f4d8cc3..9d7355662a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 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 25b30db118..345647e239 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 1; 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 2664ec9d5a..b050b6dd1b 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 1 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 105f636376..ba59a39c04 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 24770123b0..66406f6820 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 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 a73187452d..7bcb039986 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 273c2e81f5..a78309b03c 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 0b1d38db68..35aeba7012 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 0f3d83e919..6013e8082e 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 99cc03b1aa..0240d6e1fa 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 080c420a58..a035df3f82 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 628b6949b5..3015f94418 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 e262942c05..6b76e28f7a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 97aec27d5d..0ba0f5789c 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 3924cd2e24..4394174adf 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 5940edc528..6482003ea9 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 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 47e5ab9d2a..134bfebedc 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 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 9774735403..f8abb48cb5 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 27675c0c19..66c855d7c7 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 14142c2c1b..95b07c72cf 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 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 a10b921c11..aca3325a80 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 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 2f19236a0b..b9e8583b5e 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 2; 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 a40a36274e..efe30e11f3 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 2 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 e6ef096ac7..c7f578cada 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 2; 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 a40a36274e..efe30e11f3 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 2 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 fa9a76bba5..207fe40842 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; 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 fc884a3f86..10ff869d25 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 diff --git a/tests/resources/generator/cell_geometry_model/model.c b/tests/resources/generator/cell_geometry_model/model.c index e840ffacf0..5b20f1baf1 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 2; diff --git a/tests/resources/generator/cell_geometry_model/model.external.c b/tests/resources/generator/cell_geometry_model/model.external.c index 7c63e8ad06..81dac5b023 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 0; diff --git a/tests/resources/generator/cell_geometry_model/model.external.py b/tests/resources/generator/cell_geometry_model/model.external.py index 71aeb5cc65..ebf3e95dfa 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 0 diff --git a/tests/resources/generator/cell_geometry_model/model.py b/tests/resources/generator/cell_geometry_model/model.py index af373695ee..073195e1b7 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 2 diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.c b/tests/resources/generator/cellml_mappings_and_encapsulations/model.c index 1ba07a12ea..be5a47ce24 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.py b/tests/resources/generator/cellml_mappings_and_encapsulations/model.py index 3f7c67a046..f5c318929c 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 diff --git a/tests/resources/generator/cellml_slc_example/model.py b/tests/resources/generator/cellml_slc_example/model.py index eb1ac8055c..9c2704d9bb 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 9 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 7a75ff8ec2..2dc2b7dc3a 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 736efe8321..8610426693 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.c b/tests/resources/generator/cellml_unit_scaling_constant/model.c index 78ceac60b7..f6dd0489ab 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 9; diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.py b/tests/resources/generator/cellml_unit_scaling_constant/model.py index 53ba24b239..13964de556 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 9 diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.c b/tests/resources/generator/cellml_unit_scaling_rate/model.c index e57a3de290..a91274389c 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.py b/tests/resources/generator/cellml_unit_scaling_rate/model.py index f8138f6796..1549d178c9 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.c b/tests/resources/generator/cellml_unit_scaling_state/model.c index c4e73ed281..fa41c4a456 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.py b/tests/resources/generator/cellml_unit_scaling_state/model.py index cf653229ef..f03218f461 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 90e7ab5c71..c10b8e5144 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 945567341b..818a52e3f9 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 95cab4500e..af6d3cb45c 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 68f872fdde..76e7f6c567 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 238f318c71..72449b3650 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 3d7c5c42b9..83bce7bcb2 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 027f9fafc2..d0d47bacd8 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 3; 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 d776e2d377..7c4882865a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 3 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 72c9e9908e..41571208f1 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 1e17c24d34..adf5f5420c 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 diff --git a/tests/resources/generator/dependent_eqns/model.c b/tests/resources/generator/dependent_eqns/model.c index b7135def66..52f5863aec 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; diff --git a/tests/resources/generator/dependent_eqns/model.py b/tests/resources/generator/dependent_eqns/model.py index 9298fe7c89..373b5d087b 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 c8d1c6d166..b60891d0ca 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 33; @@ -462,8 +462,8 @@ void computeComputedConstants(double voi, double *states, double *rates, double computedConstants[5] = constants[2]/(constants[20]+constants[2]); computedConstants[6] = (constants[1] > 0.0)?-0.25:(constants[0] > 0.0)?0.7*constants[0]/(0.00009+constants[0]):0.0; computedConstants[7] = constants[34]*(1.0-computedConstants[6]); - computedConstants[10] = 0.000000001*3.14159265358979*pow(constants[55], 2.0)*constants[54]; - computedConstants[2] = 0.000000001*2.0*3.14159265358979*constants[56]*(constants[55]-constants[56]/2.0)*constants[54]; + computedConstants[10] = 0.000000001*3.1415926535897932*pow(constants[55], 2.0)*constants[54]; + computedConstants[2] = 0.000000001*2.0*3.1415926535897932*constants[56]*(constants[55]-constants[56]/2.0)*constants[54]; computedConstants[9] = constants[57]*computedConstants[10]; computedConstants[3] = constants[58]*computedConstants[10]-computedConstants[2]; computedConstants[8] = constants[59]*computedConstants[10]; 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 51a394f9b5..f6d6baa4e5 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 33 @@ -447,8 +447,8 @@ def compute_computed_constants(voi, states, rates, constants, computed_constants computed_constants[5] = constants[2]/(constants[20]+constants[2]) computed_constants[6] = -0.25 if gt_func(constants[1], 0.0) else 0.7*constants[0]/(0.00009+constants[0]) if gt_func(constants[0], 0.0) else 0.0 computed_constants[7] = constants[34]*(1.0-computed_constants[6]) - computed_constants[10] = 0.000000001*3.14159265358979*pow(constants[55], 2.0)*constants[54] - computed_constants[2] = 0.000000001*2.0*3.14159265358979*constants[56]*(constants[55]-constants[56]/2.0)*constants[54] + computed_constants[10] = 0.000000001*3.1415926535897932*pow(constants[55], 2.0)*constants[54] + computed_constants[2] = 0.000000001*2.0*3.1415926535897932*constants[56]*(constants[55]-constants[56]/2.0)*constants[54] computed_constants[9] = constants[57]*computed_constants[10] computed_constants[3] = constants[58]*computed_constants[10]-computed_constants[2] computed_constants[8] = constants[59]*computed_constants[10] 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 f8f084e97f..f004347511 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 15; 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 c426c91227..bccbc5668a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 15 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 360b8600ef..151b899285 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 31d17d8c6c..5455499c73 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 30f951f73c..9123c8abe0 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 0dc2048d7a..69080b4743 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 62af5e56da..7dde72148a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 2ecacc08a2..ac0eedbce0 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 3b9799fdc0..0f8f410b68 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 5e0956da0e..6deda3e3ae 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 992e358e06..51347ff59c 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 3; 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 ff169a684b..4cae80397f 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 3 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 f69d3abf4f..c52d215ebc 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 bc96db4da6..b6ee485aba 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 edea396d3d..da26c595cf 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 301c583b41..c59d3a6007 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 e6a184bfa5..064aa47bc5 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 947dc831ab..34a79d32fb 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 44e8739dcb..7ed6bee39e 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 301c583b41..c59d3a6007 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 6f54b0cca5..22f4c23fdf 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 286e2c048d..6e8814a6f6 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 5efdff35a2..9d4350ce8e 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 301c583b41..c59d3a6007 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 30e8d30f10..61f6a54e95 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 e6ad02be50..8144cb8026 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 681ea4aa80..1603926a8d 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 3394469a79..0b30de9f0e 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 a6357b62ae..0935ea1fad 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 8c7cdc908d..b19727056a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 fd2ead6509..43ca5243e9 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 3394469a79..0b30de9f0e 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 f931b08927..1f9132782a 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 5e2fb86b5c..ab53a87e1a 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 f44297f3a2..d53480c271 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 8ddf89e564..c7272323e8 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 a0daad6975..5f3bea7370 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 bec4e10935..3e4165286a 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 735951e4c9..1abbf38fdc 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 690d86a312..cf6a2b2b93 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 b4b128ea83..f0fb2e4100 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 f10c7d0b18..a3cfde0fca 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 3; 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 7b0bf1e9d4..fef160fbb3 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 3 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 ccff3e5589..2085b6bb48 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 8a850a888b..6b72eed097 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 3; 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 d2349ff2b6..e2f263fe67 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 3 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 55eea56971..f287868482 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 15df064776..8ca2a61a09 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 54a0f3f391..50e2e5cddc 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 cecefe9772..d28cc5af00 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 d3d7f752c0..b9ab122d8f 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 ad27a546cd..7767a188b4 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 27cca09b6a..d349eef05f 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 b0df2d4032..2cfc67e3c1 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 265e66a367..3f32139d50 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 f4e805a3f2..27b968005e 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 179345657f..132cbb6186 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 a9c5b54554..dd8a88500d 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 292c833549..55f8c4f39b 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 4c2ee758c9..9fbed5c443 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 aac251167e..4c059d1430 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; 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 b8a8983363..807b17fa73 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 diff --git a/tests/resources/generator/noble_model_1962/model.c b/tests/resources/generator/noble_model_1962/model.c index 183535a3c5..0a46316df0 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 4; diff --git a/tests/resources/generator/noble_model_1962/model.py b/tests/resources/generator/noble_model_1962/model.py index 22e0908873..1ad5df6a53 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 4 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 e99a5cc901..af15cc46ee 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 5dc65c9866..c23304c3a9 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 0fb33a33c7..c71ef3a03b 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 7d0c955f67..e5f5dddc26 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 32c7740fe4..93d57b543c 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 a8d6d54b95..40e0a6799d 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 38f55ad56e..3d45027b70 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 d72794fbb1..0b589e49ab 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 diff --git a/tests/resources/generator/ode_constant_on_rhs/model.c b/tests/resources/generator/ode_constant_on_rhs/model.c index 48fce6fb96..ec98456790 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; diff --git a/tests/resources/generator/ode_constant_on_rhs/model.py b/tests/resources/generator/ode_constant_on_rhs/model.py index 804850e92b..ccfaa4a5a1 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 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 83234bb147..347bbeafa0 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; 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 8890cacf07..126e35dcb3 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.c b/tests/resources/generator/ode_multiple_dependent_odes/model.c index 9887195987..a0d9e1242a 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.py b/tests/resources/generator/ode_multiple_dependent_odes/model.py index 0f66901640..67ad3652e2 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 8f0d7e1946..3e2cb6f13b 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 27f3b17587..ab0a4648ee 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 c396746157..190b5426d4 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 28563adf44..ef061b0ee7 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 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 5d00af15da..dfd30c4836 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; 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 ae5f962103..5663693bec 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 diff --git a/tests/resources/generator/robertson_model_1966/model.dae.c b/tests/resources/generator/robertson_model_1966/model.dae.c index 981bc4cce8..c6d24d47b5 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 2; diff --git a/tests/resources/generator/robertson_model_1966/model.dae.py b/tests/resources/generator/robertson_model_1966/model.dae.py index 842d7b8262..c9cd684638 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 2 diff --git a/tests/resources/generator/robertson_model_1966/model.ode.c b/tests/resources/generator/robertson_model_1966/model.ode.c index bdd03a9fbf..2c09114414 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 3; diff --git a/tests/resources/generator/robertson_model_1966/model.ode.py b/tests/resources/generator/robertson_model_1966/model.ode.py index b89effdcdd..c2b03e83d2 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 3 diff --git a/tests/resources/generator/sine_model_imports/model.c b/tests/resources/generator/sine_model_imports/model.c index 7068226c71..f170cf0374 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 1; @@ -92,11 +92,11 @@ void initialiseArrays(double *states, double *rates, double *constants, double * constants[0] = 0.0; states[0] = constants[0]; constants[1] = 0.75; - computedConstants[0] = 2.0/3.14159265358979; - computedConstants[1] = 2.0*3.14159265358979; - computedConstants[2] = 3.14159265358979/2.0; - computedConstants[3] = 3.14159265358979; - computedConstants[4] = 3.0*3.14159265358979/2.0; + computedConstants[0] = 2.0/3.1415926535897932; + computedConstants[1] = 2.0*3.1415926535897932; + computedConstants[2] = 3.1415926535897932/2.0; + computedConstants[3] = 3.1415926535897932; + computedConstants[4] = 3.0*3.1415926535897932/2.0; } void computeComputedConstants(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) @@ -111,6 +111,6 @@ void computeRates(double voi, double *states, double *rates, double *constants, void computeVariables(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraicVariables) { algebraicVariables[0] = sin(voi); - algebraicVariables[2] = (voi < computedConstants[2])?voi*computedConstants[0]-0.5:(voi < computedConstants[3])?(3.14159265358979-voi)*computedConstants[0]-0.5:(voi < computedConstants[4])?(voi-3.14159265358979)*computedConstants[0]-0.5:(computedConstants[1]-voi)*computedConstants[0]-0.5; + algebraicVariables[2] = (voi < computedConstants[2])?voi*computedConstants[0]-0.5:(voi < computedConstants[3])?(3.1415926535897932-voi)*computedConstants[0]-0.5:(voi < computedConstants[4])?(voi-3.1415926535897932)*computedConstants[0]-0.5:(computedConstants[1]-voi)*computedConstants[0]-0.5; algebraicVariables[1] = (voi < computedConstants[2])?-algebraicVariables[2]*algebraicVariables[2]+constants[1]+algebraicVariables[2]:(voi < computedConstants[3])?-algebraicVariables[2]*algebraicVariables[2]+constants[1]+algebraicVariables[2]:(voi < computedConstants[4])?algebraicVariables[2]*algebraicVariables[2]-constants[1]-algebraicVariables[2]:algebraicVariables[2]*algebraicVariables[2]-constants[1]-algebraicVariables[2]; } diff --git a/tests/resources/generator/sine_model_imports/model.py b/tests/resources/generator/sine_model_imports/model.py index 3c283ecf2f..d252c67adf 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 1 @@ -62,11 +62,11 @@ def initialise_arrays(states, rates, constants, computed_constants, algebraic_va constants[0] = 0.0 states[0] = constants[0] constants[1] = 0.75 - computed_constants[0] = 2.0/3.14159265358979 - computed_constants[1] = 2.0*3.14159265358979 - computed_constants[2] = 3.14159265358979/2.0 - computed_constants[3] = 3.14159265358979 - computed_constants[4] = 3.0*3.14159265358979/2.0 + computed_constants[0] = 2.0/3.1415926535897932 + computed_constants[1] = 2.0*3.1415926535897932 + computed_constants[2] = 3.1415926535897932/2.0 + computed_constants[3] = 3.1415926535897932 + computed_constants[4] = 3.0*3.1415926535897932/2.0 def compute_computed_constants(voi, states, rates, constants, computed_constants, algebraic_variables): @@ -79,5 +79,5 @@ def compute_rates(voi, states, rates, constants, computed_constants, algebraic_v def compute_variables(voi, states, rates, constants, computed_constants, algebraic_variables): algebraic_variables[0] = sin(voi) - algebraic_variables[2] = voi*computed_constants[0]-0.5 if lt_func(voi, computed_constants[2]) else (3.14159265358979-voi)*computed_constants[0]-0.5 if lt_func(voi, computed_constants[3]) else (voi-3.14159265358979)*computed_constants[0]-0.5 if lt_func(voi, computed_constants[4]) else (computed_constants[1]-voi)*computed_constants[0]-0.5 + algebraic_variables[2] = voi*computed_constants[0]-0.5 if lt_func(voi, computed_constants[2]) else (3.1415926535897932-voi)*computed_constants[0]-0.5 if lt_func(voi, computed_constants[3]) else (voi-3.1415926535897932)*computed_constants[0]-0.5 if lt_func(voi, computed_constants[4]) else (computed_constants[1]-voi)*computed_constants[0]-0.5 algebraic_variables[1] = -algebraic_variables[2]*algebraic_variables[2]+constants[1]+algebraic_variables[2] if lt_func(voi, computed_constants[2]) else -algebraic_variables[2]*algebraic_variables[2]+constants[1]+algebraic_variables[2] if lt_func(voi, computed_constants[3]) else algebraic_variables[2]*algebraic_variables[2]-constants[1]-algebraic_variables[2] if lt_func(voi, computed_constants[4]) else algebraic_variables[2]*algebraic_variables[2]-constants[1]-algebraic_variables[2] 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 71feaa36e7..fd2aea0bb5 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t CONSTANT_COUNT = 8; 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 2a9d38fdc6..9f4214dfc0 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" CONSTANT_COUNT = 8 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 fc57c706ff..0e4f928acc 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.8.0"; +const char VERSION[] = "0.8.1"; const char LIBCELLML_VERSION[] = "0.7.1"; const size_t STATE_COUNT = 22; 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 4700f73d64..c9df32d2c3 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.8.0" +__version__ = "0.8.1" LIBCELLML_VERSION = "0.7.1" STATE_COUNT = 22