Reverted commit 6a48c0f.

Author: agarny

src/analyser.cpp

@@ -483,36 +483,34 @@ void Analyser::AnalyserImpl::analyseNode(const XmlNodePtr &node,
         //                 +-------------+
 
         auto childCount = mathmlChildCount(node);
+        AnalyserEquationAstPtr tempAst;
+        AnalyserEquationAstPtr astRightChild;
 
-        analyseNode(mathmlChildNode(node, 0), ast, astParent, component, equation);
-
-        if (childCount >= 2) {
-            analyseNode(mathmlChildNode(node, 1), ast->mPimpl->mOwnedLeftChild, ast, component, equation);
-
-            if (childCount >= 3) {
-                AnalyserEquationAstPtr astRightChild;
-                AnalyserEquationAstPtr tempAst;
-
-                analyseNode(mathmlChildNode(node, childCount - 1), astRightChild, nullptr, component, equation);
-
-                for (auto i = childCount - 2; i > 1; --i) {
-                    tempAst = AnalyserEquationAst::create();
-
-                    analyseNode(mathmlChildNode(node, 0), tempAst, nullptr, component, equation);
-                    analyseNode(mathmlChildNode(node, i), tempAst->mPimpl->mOwnedLeftChild, tempAst, component, equation);
+        for (size_t i = childCount - 1; i > 0; --i) {
+            astRightChild = tempAst;
+            tempAst = AnalyserEquationAst::create();
 
+            if (astRightChild != nullptr) {
+                if (i == childCount - 2) {
+                    astRightChild->swapLeftAndRightChildren();
+                    tempAst = astRightChild;
+                } else {
                     astRightChild->mPimpl->mParent = tempAst;
-
                     tempAst->mPimpl->mOwnedRightChild = astRightChild;
-                    astRightChild = tempAst;
                 }
+            }
 
-                astRightChild->mPimpl->mParent = ast;
-
-                ast->mPimpl->mOwnedRightChild = astRightChild;
+            if (i != childCount - 2) {
+                analyseNode(mathmlChildNode(node, 0), tempAst, nullptr, component, equation);
             }
+
+            analyseNode(mathmlChildNode(node, i), tempAst->mPimpl->mOwnedLeftChild, tempAst, component, equation);
         }
 
+        analyseNode(mathmlChildNode(node, 0), tempAst, astParent, component, equation);
+
+        ast = tempAst;
+
         // Relational and logical operators.
 
     } else if (node->isMathmlElement("eq")) {

tests/analyser/analyser.cpp

@@ -921,8 +921,8 @@ TEST(Analyser, algebraicSystemWithThreeLinkedUnknownsWithOneExternalVariable)
     EXPECT_EQ(size_t(0), parser->issueCount());
 
     const std::vector<std::string> expectedIssues = {
-        "Variable 'y' in component 'my_algebraic_system' is computed more than once.",
         "Variable 'z' in component 'my_algebraic_system' is computed more than once.",
+        "Variable 'y' in component 'my_algebraic_system' is computed more than once.",
     };
 
     auto analyser = libcellml::Analyser::create();
@@ -977,8 +977,8 @@ TEST(Analyser, overconstrainedNlaSystem)
     EXPECT_EQ(size_t(0), parser->issueCount());
 
     const std::vector<std::string> expectedIssues = {
-        "Variable 'x' in component 'my_algebraic_system' is computed more than once.",
         "Variable 'y' in component 'my_algebraic_system' is computed more than once.",
+        "Variable 'x' in component 'my_algebraic_system' is computed more than once.",
     };
 
     auto analyser = libcellml::Analyser::create();

tests/analyser/analyserunits.cpp

@@ -883,8 +883,8 @@ TEST(AnalyserUnits, powerValues)
         "The units in 'eqnPi = pow(x, pi)' in component 'my_component' are not equivalent. 'eqnPi' is in 'second' while 'pow(x, pi)' is in 'second^3.14159'.",
         "The units in 'eqnInfinity = pow(x, infinity)' in component 'my_component' are not equivalent. 'eqnInfinity' is in 'second' while 'pow(x, infinity)' is in 'second^inf' (i.e. '10^nan x second^inf').",
         "The units in 'eqnNotanumber = pow(x, notanumber)' in component 'my_component' are not equivalent. 'eqnNotanumber' is in 'second' while 'pow(x, notanumber)' is in 'second^nan' (i.e. '10^nan x second^nan').",
-        "The type of variable 'eqnCoverage' in component 'my_component' is unknown.",
         "The type of variable 'u' in component 'my_component' is unknown.",
+        "The type of variable 'eqnCoverage' in component 'my_component' is unknown.",
         "The type of variable 'eqnCoverage2' in component 'my_component' is unknown.",
         "The type of variable 'eqnCoverage3' in component 'my_component' is unknown.",
     };

tests/resources/coverage/generator/model.c

@@ -16,8 +16,8 @@ const VariableInfo CONSTANT_INFO[] = {
 };
 
 const VariableInfo COMPUTED_CONSTANT_INFO[] = {
-    {"x", "dimensionless", "my_algebraic_eqn"},
-    {"a", "dimensionless", "my_algebraic_eqn"}
+    {"a", "dimensionless", "my_algebraic_eqn"},
+    {"x", "dimensionless", "my_algebraic_eqn"}
 };
 
 const VariableInfo ALGEBRAIC_INFO[] = {
@@ -63,12 +63,12 @@ void deleteArray(double *array)
 
 void initialiseVariables(double *constants, double *computedConstants, double *algebraic)
 {
-    computedConstants[1] = 1.0;
+    computedConstants[0] = 1.0;
 }
 
 void computeComputedConstants(double *constants, double *computedConstants)
 {
-    computedConstants[0] = computedConstants[1];
+    computedConstants[1] = computedConstants[0];
 }
 
 void computeVariables(double *constants, double *computedConstants, double *algebraic)

tests/resources/coverage/generator/model.implementation.out

@@ -15,8 +15,8 @@
 ]
 
 COMPUTED_CONSTANT_INFO = [
-    {"name": "x", "units": "dimensionless", "component": "my_algebraic_eqn"},
-    {"name": "a", "units": "dimensionless", "component": "my_algebraic_eqn"}
+    {"name": "a", "units": "dimensionless", "component": "my_algebraic_eqn"},
+    {"name": "x", "units": "dimensionless", "component": "my_algebraic_eqn"}
 ]
 
 ALGEBRAIC_INFO = [
@@ -36,11 +36,11 @@ def create_algebraic_array():
 
 
 def initialise_variables(constants, computed_constants, algebraic):
-    computed_constants[1] = 1.0
+    computed_constants[0] = 1.0
 
 
 def compute_computed_constants(constants, computed_constants):
-    computed_constants[0] = computed_constants[1]
+    computed_constants[1] = computed_constants[0]
 
 
 def compute_variables(constants, computed_constants, algebraic):

tests/resources/coverage/generator/model.modified.profile.c

@@ -19,9 +19,9 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = {
 };
 
 const VariableInfo ALGEBRAIC_INFO[] = {
-    {"x", "dimensionless", "my_algebraic_system"},
+    {"z", "dimensionless", "my_algebraic_system"},
     {"y", "dimensionless", "my_algebraic_system"},
-    {"z", "dimensionless", "my_algebraic_system"}
+    {"x", "dimensionless", "my_algebraic_system"}
 };
 
 double * createConstantsArray()
@@ -81,9 +81,9 @@ void objectiveFunction0(double *u, double *f, void *data)
     algebraic[1] = u[1];
     algebraic[2] = u[2];
 
-    f[0] = 2.0*algebraic[0]+algebraic[1]-2.0*algebraic[2]-(-1.0);
-    f[1] = 3.0*algebraic[0]-3.0*algebraic[1]-algebraic[2]-5.0;
-    f[2] = algebraic[0]-2.0*algebraic[1]+3.0*algebraic[2]-6.0;
+    f[0] = 2.0*algebraic[2]+algebraic[1]-2.0*algebraic[0]-(-1.0);
+    f[1] = 3.0*algebraic[2]-3.0*algebraic[1]-algebraic[0]-5.0;
+    f[2] = algebraic[2]-2.0*algebraic[1]+3.0*algebraic[0]-6.0;
 }
 
 void findRoot0(double *constants, double *computedConstants, double *algebraic)

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

@@ -23,9 +23,9 @@ const VariableInfo ALGEBRAIC_INFO[] = {
 };
 
 const VariableInfo EXTERNAL_INFO[] = {
-    {"x", "dimensionless", "my_algebraic_system"},
+    {"z", "dimensionless", "my_algebraic_system"},
     {"y", "dimensionless", "my_algebraic_system"},
-    {"z", "dimensionless", "my_algebraic_system"}
+    {"x", "dimensionless", "my_algebraic_system"}
 };
 
 double * createConstantsArray()

tests/resources/coverage/generator/model.out

@@ -22,9 +22,9 @@
 ]
 
 EXTERNAL_INFO = [
-    {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"},
+    {"name": "z", "units": "dimensionless", "component": "my_algebraic_system"},
     {"name": "y", "units": "dimensionless", "component": "my_algebraic_system"},
-    {"name": "z", "units": "dimensionless", "component": "my_algebraic_system"}
+    {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"}
 ]
 
 

tests/resources/coverage/generator/model.py

@@ -18,9 +18,9 @@
 ]
 
 ALGEBRAIC_INFO = [
-    {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"},
+    {"name": "z", "units": "dimensionless", "component": "my_algebraic_system"},
     {"name": "y", "units": "dimensionless", "component": "my_algebraic_system"},
-    {"name": "z", "units": "dimensionless", "component": "my_algebraic_system"}
+    {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"}
 ]
 
 
@@ -48,9 +48,9 @@ def objective_function_0(u, f, data):
     algebraic[1] = u[1]
     algebraic[2] = u[2]
 
-    f[0] = 2.0*algebraic[0]+algebraic[1]-2.0*algebraic[2]-(-1.0)
-    f[1] = 3.0*algebraic[0]-3.0*algebraic[1]-algebraic[2]-5.0
-    f[2] = algebraic[0]-2.0*algebraic[1]+3.0*algebraic[2]-6.0
+    f[0] = 2.0*algebraic[2]+algebraic[1]-2.0*algebraic[0]-(-1.0)
+    f[1] = 3.0*algebraic[2]-3.0*algebraic[1]-algebraic[0]-5.0
+    f[2] = algebraic[2]-2.0*algebraic[1]+3.0*algebraic[0]-6.0
 
 
 def find_root_0(constants, computed_constants, algebraic):

tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c

@@ -13,18 +13,18 @@ const size_t COMPUTED_CONSTANT_COUNT = 1;
 const size_t ALGEBRAIC_COUNT = 3;
 
 const VariableInfo CONSTANT_INFO[] = {
-    {"x", "dimensionless", "my_algebraic_system"},
-    {"y", "dimensionless", "my_algebraic_system"}
+    {"y", "dimensionless", "my_algebraic_system"},
+    {"x", "dimensionless", "my_algebraic_system"}
 };
 
 const VariableInfo COMPUTED_CONSTANT_INFO[] = {
     {"a", "dimensionless", "my_algebraic_system"}
 };
 
 const VariableInfo ALGEBRAIC_INFO[] = {
-    {"d", "dimensionless", "my_algebraic_system"},
+    {"c", "dimensionless", "my_algebraic_system"},
     {"b", "dimensionless", "my_algebraic_system"},
-    {"c", "dimensionless", "my_algebraic_system"}
+    {"d", "dimensionless", "my_algebraic_system"}
 };
 
 double * createConstantsArray()
@@ -80,42 +80,42 @@ void objectiveFunction0(double *u, double *f, void *data)
     double *computedConstants = ((RootFindingInfo *) data)->computedConstants;
     double *algebraic = ((RootFindingInfo *) data)->algebraic;
 
-    algebraic[2] = u[0];
+    algebraic[0] = u[0];
     algebraic[1] = u[1];
 
-    f[0] = 3.0*computedConstants[0]+2.0*algebraic[1]+algebraic[2]-57.0;
-    f[1] = computedConstants[0]+3.0*algebraic[1]-algebraic[2]-19.0;
+    f[0] = 3.0*computedConstants[0]+2.0*algebraic[1]+algebraic[0]-57.0;
+    f[1] = computedConstants[0]+3.0*algebraic[1]-algebraic[0]-19.0;
 }
 
 void findRoot0(double *constants, double *computedConstants, double *algebraic)
 {
     RootFindingInfo rfi = { constants, computedConstants, algebraic };
     double u[2];
 
-    u[0] = algebraic[2];
+    u[0] = algebraic[0];
     u[1] = algebraic[1];
 
     nlaSolve(objectiveFunction0, u, 2, &rfi);
 
-    algebraic[2] = u[0];
+    algebraic[0] = u[0];
     algebraic[1] = u[1];
 }
 
 void initialiseVariables(double *constants, double *computedConstants, double *algebraic)
 {
-    constants[0] = 3.0;
-    constants[1] = 5.0;
+    constants[0] = 5.0;
+    constants[1] = 3.0;
+    algebraic[0] = 1.0;
     algebraic[1] = 1.0;
-    algebraic[2] = 1.0;
 }
 
 void computeComputedConstants(double *constants, double *computedConstants)
 {
-    computedConstants[0] = 3.0*constants[0]+constants[1];
+    computedConstants[0] = 3.0*constants[1]+constants[0];
 }
 
 void computeVariables(double *constants, double *computedConstants, double *algebraic)
 {
     findRoot0(constants, computedConstants, algebraic);
-    algebraic[0] = algebraic[1]+algebraic[2];
+    algebraic[2] = algebraic[1]+algebraic[0];
 }

tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py

@@ -12,18 +12,18 @@
 ALGEBRAIC_COUNT = 3
 
 CONSTANT_INFO = [
-    {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"},
-    {"name": "y", "units": "dimensionless", "component": "my_algebraic_system"}
+    {"name": "y", "units": "dimensionless", "component": "my_algebraic_system"},
+    {"name": "x", "units": "dimensionless", "component": "my_algebraic_system"}
 ]
 
 COMPUTED_CONSTANT_INFO = [
     {"name": "a", "units": "dimensionless", "component": "my_algebraic_system"}
 ]
 
 ALGEBRAIC_INFO = [
-    {"name": "d", "units": "dimensionless", "component": "my_algebraic_system"},
+    {"name": "c", "units": "dimensionless", "component": "my_algebraic_system"},
     {"name": "b", "units": "dimensionless", "component": "my_algebraic_system"},
-    {"name": "c", "units": "dimensionless", "component": "my_algebraic_system"}
+    {"name": "d", "units": "dimensionless", "component": "my_algebraic_system"}
 ]
 
 
@@ -47,36 +47,36 @@ def objective_function_0(u, f, data):
     computed_constants = data[1]
     algebraic = data[2]
 
-    algebraic[2] = u[0]
+    algebraic[0] = u[0]
     algebraic[1] = u[1]
 
-    f[0] = 3.0*computed_constants[0]+2.0*algebraic[1]+algebraic[2]-57.0
-    f[1] = computed_constants[0]+3.0*algebraic[1]-algebraic[2]-19.0
+    f[0] = 3.0*computed_constants[0]+2.0*algebraic[1]+algebraic[0]-57.0
+    f[1] = computed_constants[0]+3.0*algebraic[1]-algebraic[0]-19.0
 
 
 def find_root_0(constants, computed_constants, algebraic):
     u = [nan]*2
 
-    u[0] = algebraic[2]
+    u[0] = algebraic[0]
     u[1] = algebraic[1]
 
     u = nla_solve(objective_function_0, u, 2, [constants, computed_constants, algebraic])
 
-    algebraic[2] = u[0]
+    algebraic[0] = u[0]
     algebraic[1] = u[1]
 
 
 def initialise_variables(constants, computed_constants, algebraic):
-    constants[0] = 3.0
-    constants[1] = 5.0
+    constants[0] = 5.0
+    constants[1] = 3.0
+    algebraic[0] = 1.0
     algebraic[1] = 1.0
-    algebraic[2] = 1.0
 
 
 def compute_computed_constants(constants, computed_constants):
-    computed_constants[0] = 3.0*constants[0]+constants[1]
+    computed_constants[0] = 3.0*constants[1]+constants[0]
 
 
 def compute_variables(constants, computed_constants, algebraic):
     find_root_0(constants, computed_constants, algebraic)
-    algebraic[0] = algebraic[1]+algebraic[2]
+    algebraic[2] = algebraic[1]+algebraic[0]

tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c

@@ -13,8 +13,8 @@ const size_t COMPUTED_CONSTANT_COUNT = 1;
 const size_t ALGEBRAIC_COUNT = 3;
 
 const VariableInfo CONSTANT_INFO[] = {
-    {"x", "dimensionless", "my_algebraic_system"},
-    {"y", "dimensionless", "my_algebraic_system"}
+    {"y", "dimensionless", "my_algebraic_system"},
+    {"x", "dimensionless", "my_algebraic_system"}
 };
 
 const VariableInfo COMPUTED_CONSTANT_INFO[] = {
@@ -103,15 +103,15 @@ void findRoot0(double *constants, double *computedConstants, double *algebraic)
 
 void initialiseVariables(double *constants, double *computedConstants, double *algebraic)
 {
-    constants[0] = 3.0;
-    constants[1] = 5.0;
+    constants[0] = 5.0;
+    constants[1] = 3.0;
     algebraic[0] = 1.0;
     algebraic[1] = 1.0;
 }
 
 void computeComputedConstants(double *constants, double *computedConstants)
 {
-    computedConstants[0] = 3.0*constants[0]+constants[1];
+    computedConstants[0] = 3.0*constants[1]+constants[0];
 }
 
 void computeVariables(double *constants, double *computedConstants, double *algebraic)