Merge branch 'main' into issue1251

cellml · Nov 11, 2024 · 2ca7d2a · 2ca7d2a
2 parents 2c523d9 + e7f60d9
commit 2ca7d2a
Show file tree

Hide file tree

Showing 191 changed files with 317 additions and 315 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,8 +18,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum OS X deployment vers
 
 set(PROJECT_NAME libCellML)
 set(PROJECT_URL https://libcellml.org)
-set(_PROJECT_VERSION 0.6.2)
-set(PROJECT_DEVELOPER_VERSION )
+set(_PROJECT_VERSION 0.6.3)
+set(PROJECT_DEVELOPER_VERSION -rc.1)
 project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX)
 
 # Set policies that affect the build.

diff --git a/src/analyserequationast.cpp b/src/analyserequationast.cpp
@@ -18,6 +18,8 @@ limitations under the License.
 
 #include "analyserequationast_p.h"
 
+#include "libcellml/undefines.h"
+
 namespace libcellml {
 
 void AnalyserEquationAst::AnalyserEquationAstImpl::populate(AnalyserEquationAst::Type type,

diff --git a/tests/bindings/javascript/version.test.js b/tests/bindings/javascript/version.test.js
@@ -22,6 +22,6 @@ describe("Version tests", () => {
     libcellml = await libCellMLModule();
   });
   test('Checking version string.', () => {
-    expect(libcellml.versionString()).toBe('0.6.2');
+    expect(libcellml.versionString()).toBe('0.6.3');
   });
 })
diff --git a/tests/resources/coverage/generator/model.c b/tests/resources/coverage/generator/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 209;

diff --git a/tests/resources/coverage/generator/model.h b/tests/resources/coverage/generator/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

diff --git a/tests/resources/coverage/generator/model.implementation.out b/tests/resources/coverage/generator/model.implementation.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.3. */
 
 double xor(double x, double y)
 {

diff --git a/tests/resources/coverage/generator/model.interface.out b/tests/resources/coverage/generator/model.interface.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.3. */
 
 #pragma once
 

diff --git a/tests/resources/coverage/generator/model.modified.profile.c b/tests/resources/coverage/generator/model.modified.profile.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0.post0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 209;

diff --git a/tests/resources/coverage/generator/model.modified.profile.h b/tests/resources/coverage/generator/model.modified.profile.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.3. */
 
 #pragma once
 

diff --git a/tests/resources/coverage/generator/model.modified.profile.py b/tests/resources/coverage/generator/model.modified.profile.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using a modified Python profile of libCellML 0.6.2.
+# The content of this file was generated using a modified Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0.post0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 209

diff --git a/tests/resources/coverage/generator/model.out b/tests/resources/coverage/generator/model.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.3. */
 
 #include "customheaderfile.h"
 

diff --git a/tests/resources/coverage/generator/model.py b/tests/resources/coverage/generator/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 209

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
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t VARIABLE_COUNT = 2;
 

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
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.external.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t VARIABLE_COUNT = 2;
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

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
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 VARIABLE_COUNT = 2
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

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
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 VARIABLE_COUNT = 2
 

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
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t VARIABLE_COUNT = 2;
 

diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

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
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 VARIABLE_COUNT = 2
 

diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t VARIABLE_COUNT = 1;
 

diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 VARIABLE_COUNT = 1
 

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2

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
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

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
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2

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
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;

diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

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
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2

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
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.2";
+const char LIBCELLML_VERSION[] = "0.6.3";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;

diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.2. */
+/* The content of this file was generated using the C profile of libCellML 0.6.3. */
 
 #pragma once
 

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
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.2.
+# The content of this file was generated using the Python profile of libCellML 0.6.3.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.2"
+LIBCELLML_VERSION = "0.6.3"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2