Merge branch 'master' of https://github.com/OpenModelica/OpenModelica…

…-testsuite

.gitvalidfiles

@@ -182,6 +182,7 @@
 ./simulation/libraries/3rdParty/MathematicalAspects/ReferenceFiles/Test3PhaseSystemsStateSelect.mat
 ./simulation/libraries/3rdParty/MathematicalAspects/ReferenceFiles/TestSwitch1.mat
 ./simulation/libraries/3rdParty/MathematicalAspects/ReferenceFiles/TestSwitch2.mat
+./simulation/libraries/3rdParty/Modelica_Synchronous/simulateAll.sh
 ./simulation/libraries/3rdParty/PNlib/ReferenceFiles/PNlib.Examples.Test10.mat
 ./simulation/libraries/3rdParty/PNlib/ReferenceFiles/PNlib.Examples.Test11.mat
 ./simulation/libraries/3rdParty/PNlib/ReferenceFiles/PNlib.Examples.Test12.mat

Makefile

@@ -84,6 +84,7 @@ ThermoPower.log \
 MathematicalAspects_simulation.log \
 PNlib_simulation.log \
 parallel.log \
+parameters.log \
 simoptions.log \
 annex60.log \
 gitlibraries.log
@@ -501,6 +502,9 @@ xml.log: omc-diff
 parallel.log: omc-diff
 	$(MAKE) -C simulation/modelica/parallel -f Makefile test > $@
 	@echo $@ done
+parameters.log: omc-diff
+	$(MAKE) -C simulation/modelica/parameters -f Makefile test > $@
+	@echo $@ done
 taskGraph.log: omc-diff
 	$(MAKE) -C simulation/modelica/hpcom -f Makefile test > $@
 	@echo $@ done

flattening/libraries/biochem/BiochemModels.mos

@@ -1098,7 +1098,7 @@ checkModel(BioChem.Examples.MultiCompartments.Utilities.SmallCompartment); getEr
 //   cytosol.vpfk.s1.r = cytosol.vpfk.nS1 * cytosol.vpfk.rr;
 //   cytosol.vpfk.p1.r = (-cytosol.vpfk.nP1) * cytosol.vpfk.rr;
 //   cytosol.vpfk.p2.r = (-cytosol.vpfk.nP2) * cytosol.vpfk.rr;
-//   cytosol.vldh.rr = cytosol.vldh.e0 * (cytosol.vldh.s2.c * cytosol.vldh.s1.c * cytosol.vldh.kf / (cytosol.vldh.kmb * cytosol.vldh.kia) - cytosol.vldh.kr * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq)) / (cytosol.vldh.s2.c * (1.0 / cytosol.vldh.kia + (1.0 / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.p1.c / (cytosol.vldh.kia * cytosol.vldh.kip * cytosol.vldh.kmb)) * cytosol.vldh.s1.c + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq * cytosol.vldh.kia)) + (1.0 + cytosol.vldh.s1.c / cytosol.vldh.k1ib) * (1.0 + cytosol.vldh.s1.c * cytosol.vldh.kma / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kiq * cytosol.vldh.kmp)) + cytosol.vldh.m1.c / cytosol.vldh.kiq + cytosol.vldh.s1.c * cytosol.vldh.kma * cytosol.vldh.m1.c / (cytosol.vldh.kia * cytosol.vldh.kiq * cytosol.vldh.kmb) + cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq) + cytosol.vldh.s1.c * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kib * cytosol.vldh.kiq * cytosol.vldh.kmp));
+//   cytosol.vldh.rr = cytosol.vldh.e0 * (cytosol.vldh.s2.c * cytosol.vldh.s1.c * cytosol.vldh.kf / (cytosol.vldh.kmb * cytosol.vldh.kia) - cytosol.vldh.kr * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq)) / (cytosol.vldh.s2.c * (1.0 / cytosol.vldh.kia + (1.0 / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.p1.c / (cytosol.vldh.kia * cytosol.vldh.kip * cytosol.vldh.kmb)) * cytosol.vldh.s1.c + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq * cytosol.vldh.kia)) + (1.0 + cytosol.vldh.s1.c / cytosol.vldh.k1ib) * (1.0 + cytosol.vldh.s1.c * cytosol.vldh.kma / (cytosol.vldh.kia * cytosol.vldh.kmb) + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kiq * cytosol.vldh.kmp)) + cytosol.vldh.m1.c / cytosol.vldh.kiq + cytosol.vldh.s1.c * cytosol.vldh.kma * cytosol.vldh.m1.c / (cytosol.vldh.kia * cytosol.vldh.kiq * cytosol.vldh.kmb) + cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq) + cytosol.vldh.s1.c * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kib * cytosol.vldh.kiq * cytosol.vldh.kmp));
 //   cytosol.vldh.s1.r = cytosol.vldh.nS1 * cytosol.vldh.rr;
 //   cytosol.vldh.s2.r = cytosol.vldh.nS2 * cytosol.vldh.rr;
 //   cytosol.vldh.p1.r = (-cytosol.vldh.nP1) * cytosol.vldh.rr;
@@ -1108,7 +1108,7 @@ checkModel(BioChem.Examples.MultiCompartments.Utilities.SmallCompartment); getEr
 //   cytosol.vpdh.s2.r = cytosol.vpdh.nS2 * cytosol.vpdh.rr;
 //   cytosol.vpdh.p1.r = (-cytosol.vpdh.nP1) * cytosol.vpdh.rr;
 //   cytosol.vpdh.m1.r = 0.0;
-//   cytosol.jak.rr = cytosol.jak.KcatAK * (cytosol.jak.m1.c * cytosol.jak.s1.c - cytosol.jak.p1.c ^ 2.0) / (1.0 + 10.0 * (cytosol.jak.s1.c + cytosol.jak.p1.c) + cytosol.jak.m1.c * (10.0 + 100.0 * cytosol.jak.s1.c) + cytosol.jak.p1.c * (10.0 + 100.0 * cytosol.jak.p1.c + cytosol.jak.s1.c / 3.49));
+//   cytosol.jak.rr = cytosol.jak.KcatAK * (cytosol.jak.m1.c * cytosol.jak.s1.c - cytosol.jak.p1.c ^ 2.0) / (1.0 + 10.0 * (cytosol.jak.s1.c + cytosol.jak.p1.c) + cytosol.jak.m1.c * (10.0 + 100.0 * cytosol.jak.s1.c) + cytosol.jak.p1.c * (10.0 + 100.0 * cytosol.jak.p1.c + 0.2865329512893983 * cytosol.jak.s1.c));
 //   cytosol.jak.s1.r = cytosol.jak.nS1 * cytosol.jak.rr;
 //   cytosol.jak.p1.r = (-cytosol.jak.nP1) * cytosol.jak.rr;
 //   cytosol.jak.m1.r = 0.0;
@@ -1121,7 +1121,7 @@ checkModel(BioChem.Examples.MultiCompartments.Utilities.SmallCompartment); getEr
 //   cytosol.jatpase.rr = cytosol.jatpase.KcatATPase * cytosol.jatpase.s1.c / (0.05 + cytosol.jatpase.s1.c);
 //   cytosol.jatpase.s1.r = cytosol.jatpase.nS1 * cytosol.jatpase.rr;
 //   cytosol.jatpase.p1.r = (-cytosol.jatpase.nP1) * cytosol.jatpase.rr;
-//   cytosol.jck.rr = cytosol.jck.KcatCK * (1.84331797235023 * cytosol.jck.s1.c * cytosol.jck.s2.c + -293.33 * cytosol.jck.p1.c * cytosol.jck.p2.c) / (1.0 + cytosol.jck.s2.c / 34.9 + 1.25 * cytosol.jck.p2.c + cytosol.jck.s1.c * (1.43 + cytosol.jck.s2.c / 10.85) + cytosol.jck.p1.c * (16.7 + 10.0 * cytosol.jck.p2.c + cytosol.jck.s2.c / 2.1));
+//   cytosol.jck.rr = cytosol.jck.KcatCK * (1.84331797235023 * cytosol.jck.s1.c * cytosol.jck.s2.c + -293.33 * cytosol.jck.p1.c * cytosol.jck.p2.c) / (1.0 + 0.02865329512893983 * cytosol.jck.s2.c + 1.25 * cytosol.jck.p2.c + cytosol.jck.s1.c * (1.43 + 0.09216589861751152 * cytosol.jck.s2.c) + cytosol.jck.p1.c * (16.7 + 10.0 * cytosol.jck.p2.c + 0.4761904761904762 * cytosol.jck.s2.c));
 //   cytosol.jck.s1.r = cytosol.jck.nS1 * cytosol.jck.rr;
 //   cytosol.jck.s2.r = cytosol.jck.nS2 * cytosol.jck.rr;
 //   cytosol.jck.p1.r = (-cytosol.jck.nP1) * cytosol.jck.rr;

flattening/modelica/algorithms-functions/Algorithm1.mo

@@ -47,7 +47,7 @@ end Algorithm1;
 //   y = sin(time);
 // algorithm
 //   i := 0;
-//   a := y + -1.0;
+//   a := -1.0 + y;
 //   while 0.1 * /*Real*/(i) < y loop
 //     a := 0.5 + a;
 //     i := 1 + i;

flattening/modelica/algorithms-functions/AlgorithmFor1.mo

@@ -24,7 +24,7 @@ end AlgorithmFor1;
 // algorithm
 //   a[1] := 1.0;
 //   for i in {2, 3, 4, 5} loop
-//     a[i] := 1.0 + a[i + -1];
+//     a[i] := 1.0 + a[-1 + i];
 //   end for;
 // end AlgorithmFor1;
 // endResult

flattening/modelica/algorithms-functions/AlgorithmFor3.mo

@@ -24,7 +24,7 @@ end AlgorithmFor3;
 //   Real a[4];
 // algorithm
 //   a[1] := 1.0;
-//   for i in 1:N + -1 loop
+//   for i in 1:-1 + N loop
 //     a[1 + i] := 1.0 + a[i];
 //   end for;
 // end AlgorithmFor3;

flattening/modelica/algorithms-functions/AlgorithmSection.mo

@@ -37,7 +37,7 @@ end AlgorithmSection;
 //   z = w;
 // algorithm
 //   x1 := z + x;
-//   x2 := y + -5.0;
+//   x2 := -5.0 + y;
 //   x3 := x2 + y;
 // end AlgorithmSection;
 // endResult

flattening/modelica/algorithms-functions/Break.mo

@@ -50,7 +50,7 @@ end Break;
 //   y = sin(time);
 // algorithm
 //   i := 0;
-//   a := y + -1.0;
+//   a := -1.0 + y;
 //   while 0.1 * /*Real*/(i) < y loop
 //     a := 0.5 + a;
 //     if a > y then

flattening/modelica/algorithms-functions/Faculty1.mo

@@ -22,7 +22,7 @@ end Test;
 //   input Integer x;
 //   output Integer y;
 // algorithm
-//   y := if x > 0 then x * Faculty1(x + -1) else 1;
+//   y := if x > 0 then x * Faculty1(-1 + x) else 1;
 // end Faculty1;
 //
 // class Test

flattening/modelica/algorithms-functions/Faculty5.mo

@@ -172,7 +172,7 @@ end M1_solutions_E03_Faculty_FacultyCall;
 //   output Integer k = 1;
 // algorithm
 //   assert(n >= 0, "n must be larger than 0");
-//   k := if n == 0 then 1 else n * M1_solutions.E03.Faculty.faculty_rec(n + -1);
+//   k := if n == 0 then 1 else n * M1_solutions.E03.Faculty.faculty_rec(-1 + n);
 // end M1_solutions.E03.Faculty.faculty_rec;
 //
 // class M1_solutions_E03_Faculty_FacultyCall

flattening/modelica/algorithms-functions/FunctionBreak.mo

@@ -34,7 +34,7 @@ end FunctionBreak;
 //   protected Integer i;
 // algorithm
 //   i := 0;
-//   a := y + -1.0;
+//   a := -1.0 + y;
 //   while 0.1 * /*Real*/(i) < y loop
 //     a := 0.5 + a;
 //     if a > y then

flattening/modelica/algorithms-functions/FunctionSimplex.mo

@@ -119,16 +119,16 @@ end FunctionSimplex;
 // Result:
 // function misc_simplex1
 //   input Real[:, :] matr;
-//   output Real[size(matr, 2) + -1] x;
+//   output Real[-1 + size(matr, 2)] x;
 //   output Real z;
 //   output Integer q;
 //   output Integer p;
 //   protected Integer M;
 //   protected Integer N;
 //   protected Real[size(matr, 1), size(matr, 2)] a;
 // algorithm
-//   N := size(a, 1) + -1;
-//   M := size(a, 2) + -1;
+//   N := -1 + size(a, 1);
+//   M := -1 + size(a, 2);
 //   a := matr;
 //   p := 0;
 //   q := 0;
@@ -173,8 +173,8 @@ end FunctionSimplex;
 //   protected Integer N;
 // algorithm
 //   a := b;
-//   N := size(a, 1) + -1;
-//   M := size(a, 2) + -1;
+//   N := -1 + size(a, 1);
+//   M := -1 + size(a, 2);
 //   for j in 1:N loop
 //     for k in 1:M loop
 //       if j <> p and k <> q then

flattening/modelica/algorithms-functions/RecursiveFunctionCall.mo

@@ -30,7 +30,7 @@ end RecursiveFunctionCall;
 //   if n <= 1 then
 //     y := 1;
 //   else
-//     y := n * pkg.factorial(n + -1);
+//     y := n * pkg.factorial(-1 + n);
 //   end if;
 // end pkg.factorial;
 //

flattening/modelica/algorithms-functions/SumVectorForIf.mo

@@ -36,7 +36,7 @@ end SumVector;
 //     if v[i] > 0.0 then
 //       sum := sum + v[i];
 //     elseif v[i] > -1.0 then
-//       sum := sum + v[i] + -1.0;
+//       sum := -1.0 + sum + v[i];
 //     else
 //       sum := sum - v[i];
 //     end if;

flattening/modelica/algorithms-functions/Summation.mo

@@ -39,7 +39,7 @@ end Summation;
 //     if a[n] > 0.0 then
 //       sum := sum + a[n];
 //     end if;
-//     n := n + -1;
+//     n := -1 + n;
 //   end while;
 // end Summation;
 // endResult

flattening/modelica/algorithms-functions/Vectorizable7.mo

@@ -19,7 +19,7 @@ end Vectorizable7;
 // function Vectorizable7.f
 //   input Integer m;
 //   output Real y;
-//   protected parameter Real[m] phi = array(/*Real*/(i + -1) / /*Real*/(m + -1) for i in 1:m);
+//   protected parameter Real[m] phi = array(/*Real*/(-1 + i) / /*Real*/(-1 + m) for i in 1:m);
 //   protected parameter Real[m] t = array(cos($tmpVar5) for $tmpVar5 in phi);
 // algorithm
 //   y := sum(t);

flattening/modelica/arrays/ArrayAsAlias.mo

@@ -238,7 +238,7 @@ end ArrayAsAlias;
 //   parameter Real w.defaultJointWidth(quantity = "Length", unit = "m") = 0.05 * w.nominalLength "Default for the fixed width of a shape representing a joint";
 //   parameter Real w.defaultForceLength(quantity = "Length", unit = "m") = 0.1 * w.nominalLength "Default for the fixed length of a shape representing a force (e.g. damper)";
 //   parameter Real w.defaultForceWidth(quantity = "Length", unit = "m") = 0.05 * w.nominalLength "Default for the fixed width of a shape represening a force (e.g. spring, bushing)";
-//   parameter Real w.defaultBodyDiameter(quantity = "Length", unit = "m") = w.nominalLength / 9.0 "Default for diameter of sphere representing the center of mass of a body";
+//   parameter Real w.defaultBodyDiameter(quantity = "Length", unit = "m") = 0.1111111111111111 * w.nominalLength "Default for diameter of sphere representing the center of mass of a body";
 //   parameter Real w.defaultWidthFraction = 20.0 "Default for shape width as a fraction of shape length (e.g., for Parts.FixedTranslation)";
 //   parameter Real w.defaultArrowDiameter(quantity = "Length", unit = "m") = 0.025 * w.nominalLength "Default for arrow diameter (e.g., of forces, torques, sensors)";
 //   parameter Real w.defaultFrameDiameterFraction = 40.0 "Default for arrow diameter of a coordinate system as a fraction of axis length";

flattening/modelica/arrays/ArrayTuple.mo

@@ -82,15 +82,15 @@ end ArrayTuple;
 //   if nx == 1 then
 //     yi := y[1];
 //   else
-//     i := min(max(iLast, 1), nx + -1);
+//     i := min(max(iLast, 1), -1 + nx);
 //     if xi >= x[i] then
 //       while i < nx and xi >= x[i] loop
 //         i := 1 + i;
 //       end while;
-//       i := i + -1;
+//       i := -1 + i;
 //     else
 //       while i > 1 and xi < x[i] loop
-//         i := i + -1;
+//         i := -1 + i;
 //       end while;
 //     end if;
 //     x1 := x[i];

flattening/modelica/arrays/FillSubscriptsTest.mo

@@ -4110,7 +4110,7 @@ end Manifold;
 //   input Real Tsat(quantity = "ThermodynamicTemperature", unit = "K", displayUnit = "degC", min = 1.0, max = 10000.0, start = 300.0, nominal = 300.0);
 //   output Real psat(quantity = "Pressure", unit = "Pa", displayUnit = "bar", min = 0.0, max = 100000000.0, start = 100000.0, nominal = 100000.0);
 // algorithm
-//   psat := Buildings.Utilities.Math.Functions.spliceFunction(Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.saturationPressureLiquid(Tsat), Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.sublimationPressureIce(Tsat), Tsat + -273.16, 1.0);
+//   psat := Buildings.Utilities.Math.Functions.spliceFunction(Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.saturationPressureLiquid(Tsat), Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.sublimationPressureIce(Tsat), -273.16 + Tsat, 1.0);
 // end Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.saturationPressure;
 //
 // function Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.saturationPressureLiquid
@@ -4237,7 +4237,7 @@ end Manifold;
 //   input Real Tsat(quantity = "ThermodynamicTemperature", unit = "K", displayUnit = "degC", min = 1.0, max = 10000.0, start = 300.0, nominal = 300.0);
 //   output Real psat(quantity = "Pressure", unit = "Pa", displayUnit = "bar", min = 0.0, max = 100000000.0, start = 100000.0, nominal = 100000.0);
 // algorithm
-//   psat := Buildings.Utilities.Math.Functions.spliceFunction(Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.saturationPressureLiquid(Tsat), Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.sublimationPressureIce(Tsat), Tsat + -273.16, 1.0);
+//   psat := Buildings.Utilities.Math.Functions.spliceFunction(Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.saturationPressureLiquid(Tsat), Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.sublimationPressureIce(Tsat), -273.16 + Tsat, 1.0);
 // end Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.saturationPressure;
 //
 // function Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.saturationPressureLiquid
@@ -5001,7 +5001,7 @@ end Manifold;
 //               is negative. It must be positive.
 //               ");
 //   end for;
-//   if nX > 0 and abs(sum(X_boundary) + -1.0) > 1e-10 then
+//   if nX > 0 and abs(-1.0 + sum(X_boundary)) > 1e-10 then
 //     X_str := "";
 //     for i in 1:nX loop
 //       X_str := X_str + "   X_boundary[" + String(i, 0, true) + "] = " + String(X_boundary[i], 0, true, 6) + " \"" + substanceNames[i] + "\"
@@ -5301,7 +5301,7 @@ end Manifold;
 //   input Real Celsius(quantity = "ThermodynamicTemperature", unit = "degC");
 //   output Real Kelvin(quantity = "ThermodynamicTemperature", unit = "K", displayUnit = "degC", min = 0.0, start = 288.15, nominal = 300.0);
 // algorithm
-//   Kelvin := Celsius + 273.15;
+//   Kelvin := 273.15 + Celsius;
 // end Modelica.SIunits.Conversions.from_degC;
 //
 // function Modelica.SIunits.Conversions.to_bar
@@ -6388,7 +6388,7 @@ end Manifold;
 //             Temperature T is not in the allowed range
 //             200.0 K <= (T =" + String(sou_2.medium.T, 0, true, 6) + " K) <= 423.15 K
 //             required from medium model \"" + "Moist air unsaturated perfect gas" + "\".");
-//   sou_2.medium.MM = 1.0 / (34.52428788658843 + sou_2.medium.Xi[1] / 0.01801528 - sou_2.medium.Xi[1] / 0.0289651159);
+//   sou_2.medium.MM = 1.0 / (34.52428788658843 + 20.98414717520355 * sou_2.medium.Xi[1]);
 //   sou_2.medium.p_steam_sat = min(Buildings.Fluid.Sources.Boundary_pT$sou_2.Medium.saturationPressure(sou_2.medium.T), 0.999 * sou_2.medium.p);
 //   sou_2.medium.X_sat = min(0.6219647130774989 * sou_2.medium.p_steam_sat * (1.0 - sou_2.medium.Xi[1]) / max(1e-13, sou_2.medium.p - sou_2.medium.p_steam_sat), 1.0);
 //   sou_2.medium.X_steam = sou_2.medium.Xi[1];
@@ -6425,7 +6425,7 @@ end Manifold;
 //             Temperature T is not in the allowed range
 //             200.0 K <= (T =" + String(sin_2.medium.T, 0, true, 6) + " K) <= 423.15 K
 //             required from medium model \"" + "Moist air unsaturated perfect gas" + "\".");
-//   sin_2.medium.MM = 1.0 / (34.52428788658843 + sin_2.medium.Xi[1] / 0.01801528 - sin_2.medium.Xi[1] / 0.0289651159);
+//   sin_2.medium.MM = 1.0 / (34.52428788658843 + 20.98414717520355 * sin_2.medium.Xi[1]);
 //   sin_2.medium.p_steam_sat = min(Buildings.Fluid.Sources.Boundary_pT$sin_2.Medium.saturationPressure(sin_2.medium.T), 0.999 * sin_2.medium.p);
 //   sin_2.medium.X_sat = min(0.6219647130774989 * sin_2.medium.p_steam_sat * (1.0 - sin_2.medium.Xi[1]) / max(1e-13, sin_2.medium.p - sin_2.medium.p_steam_sat), 1.0);
 //   sin_2.medium.X_steam = sin_2.medium.Xi[1];

flattening/modelica/arrays/QualifiedSlicing.mo

@@ -24,7 +24,7 @@ end QualifiedSlicing;
 // equation
 //   v[1].x[1] = sin(time);
 //   v[1].x[2] = cos(time);
-//   v[2].x[1] = sin(time + -0.5);
-//   v[2].x[2] = cos(time + -0.5);
+//   v[2].x[1] = sin(-0.5 + time);
+//   v[2].x[2] = cos(-0.5 + time);
 // end QualifiedSlicing;
 // endResult

flattening/modelica/built-in-functions/AbsIssues.mo

@@ -81,15 +81,15 @@ end AbsIssues;
 //   if nx == 1 then
 //     yi := y[1];
 //   else
-//     i := min(max(iLast, 1), nx + -1);
+//     i := min(max(iLast, 1), -1 + nx);
 //     if xi >= x[i] then
 //       while i < nx and xi >= x[i] loop
 //         i := 1 + i;
 //       end while;
-//       i := i + -1;
+//       i := -1 + i;
 //     else
 //       while i > 1 and xi < x[i] loop
-//         i := i + -1;
+//         i := -1 + i;
 //       end while;
 //     end if;
 //     x1 := x[i];

flattening/modelica/built-in-functions/MultiFunctionReturnValueUseOnlyFirst.mo

@@ -75,15 +75,15 @@ end MultiFunctionReturnValueUseOnlyFirst;
 //   if nx == 1 then
 //     yi := y[1];
 //   else
-//     i := min(max(iLast, 1), nx + -1);
+//     i := min(max(iLast, 1), -1 + nx);
 //     if xi >= x[i] then
 //       while i < nx and xi >= x[i] loop
 //         i := 1 + i;
 //       end while;
-//       i := i + -1;
+//       i := -1 + i;
 //     else
 //       while i > 1 and xi < x[i] loop
-//         i := i + -1;
+//         i := -1 + i;
 //       end while;
 //     end if;
 //     x1 := x[i];