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

@@ -26,8 +26,8 @@ const VariableInfo COMPUTED_CONSTANT_INFO[] = {
 };
 
 const VariableInfo ALGEBRAIC_INFO[] = {
-    {"eqnNlaVariable1", "dimensionless", "my_component"},
-    {"eqnNlaVariable2", "dimensionless", "my_component"}
+    {"eqnNlaVariable2", "dimensionless", "my_component"},
+    {"eqnNlaVariable1", "dimensionless", "my_component"}
 };
 
 double xor(double x, double y)
@@ -184,8 +184,8 @@ void objectiveFunction0(double *u, double *f, void *data)
     algebraic[0] = u[0];
     algebraic[1] = u[1];
 
-    f[0] = algebraic[0]+algebraic[1]+states[0]-0.0;
-    f[1] = algebraic[0]-algebraic[1]-(my_component_eqnComputedConstant1+my_component_eqnComputedConstant2);
+    f[0] = algebraic[1]+algebraic[0]+states[0]-0.0;
+    f[1] = algebraic[1]-algebraic[0]-(my_component_eqnComputedConstant1+my_component_eqnComputedConstant2);
 }
 
 void findRoot0(double voi, double *states, double *rates, double *constants, double *computedConstants, double *algebraic)
@@ -217,8 +217,8 @@ void initialiseVariables(double *states, double *rates, double *constants, doubl
     double my_component_eqnNotanumber = NAN;
     double my_component_eqnComputedConstant1 = 1.0;
     double my_component_eqnComputedConstant2 = 3.0;
-    algebraic[0] = 1.0;
-    algebraic[1] = 2.0;
+    algebraic[0] = 2.0;
+    algebraic[1] = 1.0;
 }
 
 void computeComputedConstants(double *constants, double *computedConstants)