Update expected output for OMCompiler PR:1034

OpenModelica · Nov 30, 2016 · 5a15550 · 5a15550
1 parent 871e08c
commit 5a15550
Show file tree

Hide file tree

Showing 61 changed files with 747 additions and 771 deletions.
diff --git a/openmodelica/cruntime/optimization/basic/testAlgLoop3.mos b/openmodelica/cruntime/optimization/basic/testAlgLoop3.mos
@@ -51,10 +51,10 @@ getErrorString();
 // ******************************************************************************
 //
 // LOG_IPOPT_ERROR   | info    | max violation is 1 for the constraint $EqCon$y1(time = 1)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.491941 for the constraint $EqCon$y2(time = 1)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.0251223 for the constraint $EqCon$y1(time = 1)
-// LOG_IPOPT_ERROR   | info    | max violation is 9.99863e-05 for the constraint $EqCon$y1(time = 1)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.53473e-09 for the constraint $EqCon$y1(time = 1)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.491941 for the constraint $EqCon$y1(time = 1)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.0251223 for the constraint $EqCon$y2(time = 1)
+// LOG_IPOPT_ERROR   | info    | max violation is 9.99863e-05 for the constraint $EqCon$y2(time = 1)
+// LOG_IPOPT_ERROR   | info    | max violation is 1.53473e-09 for the constraint $EqCon$y2(time = 1)
 // "
 // end SimulationResult;
 // "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").

diff --git a/openmodelica/cruntime/optimization/basic/testAlgLoop5.mos b/openmodelica/cruntime/optimization/basic/testAlgLoop5.mos
@@ -92,19 +92,19 @@ getErrorString();
 // LOG_IPOPT_ERROR   | info    | max violation is 0.265803 for the final constraint $finalCon$fcon(time = 50)
 // LOG_IPOPT_ERROR   | info    | max violation is 0.257776 for the final constraint $finalCon$fcon(time = 50)
 // LOG_IPOPT_ERROR   | info    | max violation is 0.219093 for the final constraint $finalCon$fcon(time = 50)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.0393324 for the final constraint $finalCon$fcon(time = 50)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.00971726 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.0393323 for the final constraint $finalCon$fcon(time = 50)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.00971727 for the constraint $EqCon$t2(time = 48.8)
 // LOG_IPOPT_ERROR   | info    | max violation is 0.00522208 for the constraint $EqCon$t2(time = 48.8)
 // LOG_IPOPT_ERROR   | info    | max violation is 0.0008537 for the constraint $EqCon$t2(time = 0.8)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.000581587 for the constraint $EqCon$t2(time = 48.8)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.00030624 for the constraint $EqCon$t2(time = 48.8)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.000611677 for the constraint $EqCon$t2(time = 48.8)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.00027864 for the constraint $EqCon$t2(time = 48.8)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.00121425 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.000581585 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.000306239 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.000611672 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.000278638 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.00121427 for the constraint $EqCon$t2(time = 48.8)
 // LOG_IPOPT_ERROR   | info    | max violation is 0.00112002 for the constraint $EqCon$t2(time = 48.4)
-// LOG_IPOPT_ERROR   | info    | max violation is 0.000855813 for the constraint $EqCon$t2(time = 48.2)
-// LOG_IPOPT_ERROR   | info    | max violation is 2.22306e-05 for the constraint $EqCon$t2(time = 48.4)
-// LOG_IPOPT_ERROR   | info    | max violation is 2.18283e-05 for the constraint $EqCon$t2(time = 48.8)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.000855805 for the constraint $EqCon$t2(time = 48.2)
+// LOG_IPOPT_ERROR   | info    | max violation is 2.22297e-05 for the constraint $EqCon$t2(time = 48.4)
+// LOG_IPOPT_ERROR   | info    | max violation is 2.18284e-05 for the constraint $EqCon$t2(time = 48.8)
 // LOG_IPOPT_ERROR   | info    | max violation is 1.04517e-05 for the constraint $EqCon$t2(time = 48.8)
 // LOG_IPOPT_ERROR   | info    | max violation is 1.29938e-06 for the constraint $EqCon$t2(time = 4.4)
 // LOG_IPOPT_ERROR   | info    | max violation is 2.02641e-07 for the constraint $EqCon$t2(time = 4.4)
@@ -115,8 +115,8 @@ getErrorString();
 // "
 // end SimulationResult;
 // "Notification: Following iteration variables are selected by the user for strong component 1 (DAE kind: initialization):
-//   t1:VARIABLE(min = -0.4 start = 1.0 )  type: Real 
-//   t2:VARIABLE(min = -2.0 max = 0.5 start = 1.0 )  type: Real
+//   t2:VARIABLE(min = -2.0 max = 0.5 start = 1.0 )  type: Real 
+//   t1:VARIABLE(min = -0.4 start = 1.0 )  type: Real
 // Notification: Following iteration variables are selected by the user for strong component 2 (DAE kind: simulation):
 //   t1:VARIABLE(min = -0.4 start = 1.0 )  type: Real 
 //   t2:VARIABLE(min = -2.0 max = 0.5 start = 1.0 )  type: Real

diff --git a/openmodelica/cruntime/optimization/basic/testAlgLoop7.mos b/openmodelica/cruntime/optimization/basic/testAlgLoop7.mos
@@ -51,14 +51,14 @@ getErrorString();
 //          For more information visit http://projects.coin-or.org/Ipopt
 // ******************************************************************************
 //
-// LOG_IPOPT_ERROR   | info    | max violation is 0.00630401 for the constraint $EqCon$x2(time = 0.17)
-// LOG_IPOPT_ERROR   | info    | max violation is 2.64944e-05 for the constraint $EqCon$x1(time = 0.17)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.05608e-07 for the constraint $EqCon$x2(time = 0.17)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.86591e-05 for the constraint $EqCon$x1(time = 0.17)
-// LOG_IPOPT_ERROR   | info    | max violation is 5.33147e-06 for the constraint $EqCon$x2(time = 0.435)
-// LOG_IPOPT_ERROR   | info    | max violation is 4.28799e-08 for the constraint $EqCon$x2(time = 0.435)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.87086e-11 for the constraint $EqCon$x2(time = 0.445)
-// LOG_IPOPT_ERROR   | info    | max violation is 5.55112e-16 for the constraint $EqCon$x2(time = 0.16)
+// LOG_IPOPT_ERROR   | info    | max violation is 0.00630401 for the constraint $EqCon$x1(time = 0.17)
+// LOG_IPOPT_ERROR   | info    | max violation is 2.64944e-05 for the constraint $EqCon$x2(time = 0.17)
+// LOG_IPOPT_ERROR   | info    | max violation is 1.05608e-07 for the constraint $EqCon$x1(time = 0.17)
+// LOG_IPOPT_ERROR   | info    | max violation is 1.86591e-05 for the constraint $EqCon$x2(time = 0.17)
+// LOG_IPOPT_ERROR   | info    | max violation is 5.33147e-06 for the constraint $EqCon$x1(time = 0.435)
+// LOG_IPOPT_ERROR   | info    | max violation is 4.28799e-08 for the constraint $EqCon$x1(time = 0.435)
+// LOG_IPOPT_ERROR   | info    | max violation is 1.87081e-11 for the constraint $EqCon$x1(time = 0.445)
+// LOG_IPOPT_ERROR   | info    | max violation is 5.55112e-16 for the constraint $EqCon$x1(time = 0.16)
 // "
 // end SimulationResult;
 // ""

diff --git a/openmodelica/cruntime/simoptions/testDASSLnoEquidistant.mos b/openmodelica/cruntime/simoptions/testDASSLnoEquidistant.mos
@@ -54,27 +54,27 @@ val(z,45);
 //     simulationOptions = "startTime = 0.0, stopTime = 50.0, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
-// 0.9400817201006211
-// -0.3409492037425187
-// 1.765471500926897
-// -0.9938618504643499
-// -0.1106283064661939
-// -1.446513992917458
-// 0.9999849889806949
-// -0.00547921648409935
+// 0.9400817201005953
+// -0.3409492037425897
+// 1.765471500926861
+// -0.9938618504643484
+// -0.1106283064662084
+// -1.446513992917668
+// 0.9999849889806977
+// -0.005479216483586211
 // 0.0
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 50.0, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid'",
 //     messages = ""
 // end SimulationResult;
-// 0.9399131777155256
-// -0.3409917555699257
-// 1.765205861031661
-// -0.9938699424824931
-// -0.110452669808188
-// -1.44697468894188
-// 0.9999852421758963
-// -0.005432810544649265
+// 0.9399131777014711
+// -0.3409917555793044
+// 1.765205861008199
+// -0.9938699424805096
+// -0.1104526698113662
+// -1.446974688952034
+// 0.9999852421758935
+// -0.005432810545174873
 // 0.0
 // endResult
diff --git a/openmodelica/debugDumps/optSimpleSolveDAEdump.mos b/openmodelica/debugDumps/optSimpleSolveDAEdump.mos
@@ -236,7 +236,7 @@ buildModel(testOptdaedump); getErrorString();
 // Incidence Matrix (row: equation)
 // ========================================
 // number of rows: 3
-// 1: 2 1 3
+// 1: 3 2 1
 // 2: 3 2
 // 3: 3
 //

diff --git a/openmodelica/debugDumps/optdaedump.mos b/openmodelica/debugDumps/optdaedump.mos
@@ -546,18 +546,18 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 // number of rows: 13
 // 1: 13
-// 2: 3 2 13
-// 3: 7 12
-// 4: 1 2 12
-// 5: 6 11
-// 6: 3 1 11
-// 7: 5 10
+// 2: 13 3 2
+// 3: 12 7
+// 4: 12 2 1
+// 5: 11 6
+// 6: 11 3 1
+// 7: 10 5
 // 8: 11 10
 // 9: 9 4
 // 10: 13 -9
 // 11: 3
-// 12: 4 7 8
-// 13: -5 6 7
+// 12: 8 7 4
+// 13: 7 6 -5
 //
 // Transposed Incidence Matrix (row: variable)
 // ========================================
@@ -1826,12 +1826,12 @@ buildModel(testOptdaedump); getErrorString();
 // var 1 is solved in eqn 4
 // var 2 is solved in eqn 5
 // var 3 is solved in eqn 10
-// var 4 is solved in eqn 2
-// var 5 is solved in eqn 8
+// var 4 is solved in eqn 6
+// var 5 is solved in eqn 2
 // var 6 is solved in eqn 3
 // var 7 is solved in eqn 1
-// var 8 is solved in eqn 6
-// var 9 is solved in eqn 7
+// var 8 is solved in eqn 7
+// var 9 is solved in eqn 8
 // var 10 is solved in eqn 9
 //
 //
@@ -1841,7 +1841,7 @@ buildModel(testOptdaedump); getErrorString();
 // {9:10}
 // {4:1}
 // {1:7}
-// {7, 8, 2, 6:8, 4, 5, 9} Size: 4 Jacobian Linear
+// {7, 6, 2, 8:9, 5, 4, 8} Size: 4 Jacobian Linear
 // {5:2}
 // {3:6}
 //
@@ -1986,12 +1986,12 @@ buildModel(testOptdaedump); getErrorString();
 // var 1 is solved in eqn 4
 // var 2 is solved in eqn 5
 // var 3 is solved in eqn 10
-// var 4 is solved in eqn 2
-// var 5 is solved in eqn 8
+// var 4 is solved in eqn 6
+// var 5 is solved in eqn 2
 // var 6 is solved in eqn 3
 // var 7 is solved in eqn 1
-// var 8 is solved in eqn 6
-// var 9 is solved in eqn 7
+// var 8 is solved in eqn 7
+// var 9 is solved in eqn 8
 // var 10 is solved in eqn 9
 //
 //
@@ -2100,8 +2100,8 @@ buildModel(testOptdaedump); getErrorString();
 // Incidence Matrix (row: equation)
 // ========================================
 // number of rows: 4
-// 1: 1 2 4
-// 2: 1 3
+// 1: 4 2 1
+// 2: 3 1
 // 3: 2
 // 4: 3
 //
@@ -3329,12 +3329,12 @@ buildModel(testOptdaedump); getErrorString();
 // var 1 is solved in eqn 4
 // var 2 is solved in eqn 5
 // var 3 is solved in eqn 10
-// var 4 is solved in eqn 2
-// var 5 is solved in eqn 8
+// var 4 is solved in eqn 6
+// var 5 is solved in eqn 2
 // var 6 is solved in eqn 3
 // var 7 is solved in eqn 1
-// var 8 is solved in eqn 6
-// var 9 is solved in eqn 7
+// var 8 is solved in eqn 7
+// var 9 is solved in eqn 8
 // var 10 is solved in eqn 9
 //
 //
@@ -3490,12 +3490,12 @@ buildModel(testOptdaedump); getErrorString();
 // var 1 is solved in eqn 4
 // var 2 is solved in eqn 5
 // var 3 is solved in eqn 10
-// var 4 is solved in eqn 2
-// var 5 is solved in eqn 8
+// var 4 is solved in eqn 6
+// var 5 is solved in eqn 2
 // var 6 is solved in eqn 3
 // var 7 is solved in eqn 1
-// var 8 is solved in eqn 6
-// var 9 is solved in eqn 7
+// var 8 is solved in eqn 7
+// var 9 is solved in eqn 8
 // var 10 is solved in eqn 9
 //
 //
@@ -3651,12 +3651,12 @@ buildModel(testOptdaedump); getErrorString();
 // var 1 is solved in eqn 4
 // var 2 is solved in eqn 5
 // var 3 is solved in eqn 10
-// var 4 is solved in eqn 2
-// var 5 is solved in eqn 8
+// var 4 is solved in eqn 6
+// var 5 is solved in eqn 2
 // var 6 is solved in eqn 3
 // var 7 is solved in eqn 1
-// var 8 is solved in eqn 6
-// var 9 is solved in eqn 7
+// var 8 is solved in eqn 7
+// var 9 is solved in eqn 8
 // var 10 is solved in eqn 9
 //
 //
@@ -4929,8 +4929,8 @@ buildModel(testOptdaedump); getErrorString();
 // Incidence Matrix (row: equation)
 // ========================================
 // number of rows: 4
-// 1: 1 2 4
-// 2: 1 3
+// 1: 4 2 1
+// 2: 3 1
 // 3: 2
 // 4: 3
 //

diff --git a/openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos b/openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos
@@ -62,11 +62,11 @@ val(s, 1);
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
 // 127.2093118472222
-// -1.473673372208029
+// -1.473673372207529
 // 12720.93118472221
-// -2.525849023130222
+// -2.525849023132998
 // 0.0
-// -0.5326917977046246
+// -0.5326917977048734
 // "SimCode: The model JuliansBib.Connector_Hebelarm_einfach has been translated to FMU"
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
@@ -80,10 +80,10 @@ val(s, 1);
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'JuliansBib_Connector_Hebelarm_einfach_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
-// 29.87032083226751
-// -2.843354040235435
-// 2987.032083226751
-// -1.180467185324341
+// 127.2093118472222
+// -1.47368100777121
+// 12720.93118472221
+// -2.525875185362381
 // 0.0
-// 2.726903938445847
+// -0.5326885425067496
 // endResult
diff --git a/openmodelica/uncertainties/DataReconciliationTests21jan2013.mos b/openmodelica/uncertainties/DataReconciliationTests21jan2013.mos