expected output for fix #3738

OpenModelica · Mar 2, 2016 · b61d804 · b61d804
1 parent d9a9c88
commit b61d804
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/simulation/modelica/commonSubExp/cseFunctionCall.mos b/simulation/modelica/commonSubExp/cseFunctionCall.mos
@@ -394,7 +394,7 @@ simulate(CSE.FunctionCallTest7); getErrorString();
 // end SimulationResult;
 // ""
 //
-// ########### Updated Variable List ########### (15)
+// ########### Updated Variable List ########### (16)
 // ========================================
 // 1: r.r1:VARIABLE() .CSE.FunctionCallTest7, .CSE.types.R, .Real type: Real
 // 2: b[2]:VARIABLE() .CSE.FunctionCallTest7, .Real type: Real [2]
@@ -404,27 +404,29 @@ simulate(CSE.FunctionCallTest7); getErrorString();
 // 6: z:VARIABLE() .CSE.FunctionCallTest7, .Real type: Real
 // 7: y:VARIABLE() .CSE.FunctionCallTest7, .Real type: Real
 // 8: x:VARIABLE() .CSE.FunctionCallTest7, .Real type: Real
-// 9: $cse5[2]:VARIABLE()  type: Real [2] unreplaceable
-// 10: $cse5[1]:VARIABLE()  type: Real [2] unreplaceable
-// 11: $cse4:VARIABLE()  type: Real unreplaceable
-// 12: $cse3.r2:DISCRETE()  type: Integer unreplaceable
-// 13: $cse3.r1:VARIABLE()  type: Real unreplaceable
-// 14: $cse2:VARIABLE()  type: Real unreplaceable
-// 15: $cse1:VARIABLE()  type: Real unreplaceable
+// 9: $cse6:VARIABLE()  type: Real unreplaceable
+// 10: $cse5[2]:VARIABLE()  type: Real [2] unreplaceable
+// 11: $cse5[1]:VARIABLE()  type: Real [2] unreplaceable
+// 12: $cse4:VARIABLE()  type: Real unreplaceable
+// 13: $cse3.r2:DISCRETE()  type: Integer unreplaceable
+// 14: $cse3.r1:VARIABLE()  type: Real unreplaceable
+// 15: $cse2:VARIABLE()  type: Real unreplaceable
+// 16: $cse1:VARIABLE()  type: Real unreplaceable
 //
 //
-// ########### Updated Equation List ########### (10, 15)
+// ########### Updated Equation List ########### (11, 16)
 // ========================================
 // 1/1 (1): x = $cse2 * r.r1   [dynamic]
 // 2/2 (2): a = $cse5   [dynamic]
 // 3/4 (2): b = $cse5   [dynamic]
-// 4/6 (1): r.r1 = CSE.functions.f6_eval4(time, time)   [dynamic]
-// 5/7 (1): z = $cse4   [dynamic]
-// 6/8 (1): y = $cse4   [dynamic]
-// 7/9 (3): ($cse4, $cse5) = CSE.functions.f5(time, x, $cse3)   [binding]
-// 8/12 (2): $cse3 = CSE.functions.f6(time, x)   [binding]
-// 9/14 (1): $cse2 = sin(time * $cse1)   [binding]
-// 10/15 (1): $cse1 = cos(time)   [binding]
+// 4/6 (1): r.r1 = $cse6   [dynamic]
+// 5/7 (1): $cse6 = CSE.functions.f6_eval4(time, time)   [binding]
+// 6/8 (1): z = $cse4   [dynamic]
+// 7/9 (1): y = $cse4   [dynamic]
+// 8/10 (3): ($cse4, $cse5) = CSE.functions.f5(time, x, $cse3)   [binding]
+// 9/13 (2): $cse3 = CSE.functions.f6(time, x)   [binding]
+// 10/15 (1): $cse2 = sin(time * $cse1)   [binding]
+// 11/16 (1): $cse1 = cos(time)   [binding]
 //
 // record SimulationResult
 //     resultFile = "CSE.FunctionCallTest7_res.mat",

diff --git a/simulation/modelica/functions_eval/functionTest4.mos b/simulation/modelica/functions_eval/functionTest4.mos
@@ -22,19 +22,19 @@ getErrorString();
 // ========================================
 // SingleEquation: 4
 // 1: a:VARIABLE() .PartEvalFunc.functionTest4, .Real type: Real
-// 1/1 (1): a = time    [dynamic]
+// 1/1 (1): a = time   [dynamic]
 //
-// ComplexEquation:
+// SingleEquation: 3
 // 1: r2.y:VARIABLE() .PartEvalFunc.functionTest4, .PartEvalFunc.record1, .Real type: Real
 // 1/1 (1): r2.y = PartEvalFunc.recfunc_eval1(PartEvalFunc.record1(2.0, a), a)   [dynamic]
 //
 // SingleEquation: 2
 // 1: c:VARIABLE() .PartEvalFunc.functionTest4, .Real type: Real
-// 1/1 (1): c = r2.y + a    [dynamic]
+// 1/1 (1): c = r2.y + a   [dynamic]
 //
 // SingleEquation: 1
 // 1: d:STATE(1,c)() .PartEvalFunc.functionTest4, .Real type: Real
-// 1/1 (1): c = der(d)    [dynamic]
+// 1/1 (1): c = der(d)   [dynamic]
 //
 //
 // record SimulationResult

diff --git a/simulation/modelica/functions_eval/functionTest7.mos b/simulation/modelica/functions_eval/functionTest7.mos
@@ -22,19 +22,19 @@ getErrorString();
 // ========================================
 // SingleEquation: 1
 // 1: a:VARIABLE() .PartEvalFunc.functionTest7, .Real type: Real
-// 1/1 (1): a = time    [dynamic]
+// 1/1 (1): a = time   [dynamic]
 //
-// ComplexEquation:
+// SingleEquation: 2
 // 1: r2.z:VARIABLE() .PartEvalFunc.functionTest7, .PartEvalFunc.record2, .Real type: Real
 // 1/1 (1): r2.z = PartEvalFunc.recfunc4_eval1(PartEvalFunc.record2(2.0, a, 3.0), a)   [dynamic]
 //
 // SingleEquation: 3
 // 1: c:VARIABLE() .PartEvalFunc.functionTest7, .Real type: Real
-// 1/1 (1): c = a + r2.z    [dynamic]
+// 1/1 (1): c = a + r2.z   [dynamic]
 //
 // SingleEquation: 4
 // 1: d:STATE(1,c)(start = 0.0 fixed = true ) .PartEvalFunc.functionTest7, .Real type: Real
-// 1/1 (1): c = der(d)    [dynamic]
+// 1/1 (1): c = der(d)   [dynamic]
 //
 //
 // record SimulationResult