Skip to content

Commit 0cf9b78

Browse files
lochellochel
committed
Update expected output
1 parent e943703 commit 0cf9b78

8 files changed

+8
-89
lines changed

‎Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.C
3636
// assert | info | simulation terminated by an assertion at initialization
3737
// "
3838
// end SimulationResult;
39-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
40-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
41-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
42-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
43-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
44-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
45-
// [PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P2.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
46-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
47-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
48-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P2.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
49-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P2.enableOut, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
50-
// [PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P3.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
51-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P3.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
52-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P3.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
53-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P3.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
54-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P3.enableOut, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
55-
// Notification: The given system is mixed-determined. [index > 0]
39+
// "Notification: The given system is mixed-determined. [index > 0]
5640
// Notification: The given system is mixed-determined. [index > 1]
5741
// Notification: The given system is mixed-determined. [index > 2]
5842
// Notification: The given system is mixed-determined. [index > 3]

‎Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.C
3636
// assert | info | simulation terminated by an assertion at initialization
3737
// "
3838
// end SimulationResult;
39-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
40-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
41-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
42-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
43-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
44-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
45-
// [PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P2.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
46-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
47-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
48-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P2.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
49-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P2.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
50-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P2.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
51-
// [PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P3.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
52-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P3.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
53-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P3.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
54-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P3.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
55-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P3.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
56-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P3.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
57-
// Notification: The given system is mixed-determined. [index > 0]
39+
// "Notification: The given system is mixed-determined. [index > 0]
5840
// Notification: The given system is mixed-determined. [index > 1]
5941
// Notification: The given system is mixed-determined. [index > 2]
6042
// Notification: The given system is mixed-determined. [index > 3]

‎Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.L
2626
// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.LoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
2727
// messages = ""
2828
// end SimulationResult;
29-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
30-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
31-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
32-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
33-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
34-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
35-
// [PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P2.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
36-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
37-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
38-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P2.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
39-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P2.enableOut, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
40-
// Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
29+
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
4130
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
4231
// "
4332
// {"Files Equal!"}

‎Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.P
2525
// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.PCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
2626
// messages = ""
2727
// end SimulationResult;
28-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
29-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
30-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
31-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
32-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
33-
// Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
28+
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
3429
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
3530
// "
3631
// {"Files Equal!"}

‎Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.S
2222
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.SinglePC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
2323
// messages = ""
2424
// end SimulationResult;
25-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
26-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
27-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
28-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
29-
// Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
25+
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
3026
// "
3127
// {"Files Equal!"}
3228
// ""

‎Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.S
3232
// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.Speed', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
3333
// messages = ""
3434
// end SimulationResult;
35-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
36-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
37-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
38-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
39-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:44:11-47:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
40-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
41-
// [PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P2.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
42-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
43-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P2.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
44-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P2.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
45-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P2.enableOut, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
46-
// Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
35+
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
4736
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
4837
// "
4938
// {"Files Equal!"}

‎Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.T
2525
// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.TCtoPC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
2626
// messages = ""
2727
// end SimulationResult;
28-
// "[PNlib/PNlib/Blocks/enablingInCon.mo:34:7-98:13:writable] Warning: In component P1.enableIn, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
29-
// [PNlib/PNlib/Blocks/enablingInCon.mo:41:13-44:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
30-
// [PNlib/PNlib/Blocks/enablingInCon.mo:78:13-81:19:writable] Warning: In component P1.enableIn, in relation arcWeight[i] == 0.0, == on Real numbers is only allowed inside functions.
31-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:37:5-101:13:writable] Warning: In component P1.enableOut, in relation arcWeightSum == 0.0, == on Real numbers is only allowed inside functions.
32-
// [PNlib/PNlib/Blocks/enablingOutCon.mo:81:11-84:17:writable] Warning: In component P1.enableOut, in relation {}[i] == 0.0, == on Real numbers is only allowed inside functions.
33-
// Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
28+
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
3429
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
3530
// "
3631
// {"Files Equal!"}

0 commit comments

Comments
 (0)