Skip to content

Commit 68b2e96

Browse files
vrugevruge
vruge
authored and
vruge
committed
skipped intialation for some tests after structure breaker in OpenModelica/OMCompiler#199 
1 parent 98c810c commit 68b2e96

File tree

3 files changed

+22
-47
lines changed

3 files changed

+22
-47
lines changed

‎openmodelica/cruntime/optimization/basic/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ testAlgLoop3.mos \
3939
testAlgLoop4.mos \
4040
testAlgLoop5.mos \
4141
testAlgLoop6.mos \
42+
testAlgLoop7.mos \
4243
testAlgLoop8.mos \
4344
testAlgLoop9.mos \
4445
testAlgLoop10.mos \
@@ -48,6 +49,7 @@ TFC.mos \
4849
TFC2.mos \
4950
TFC3.mos \
5051
TFC4.mos \
52+
TFC5.mos \
5153
TFC6.mos \
5254
TFC7.mos \
5355
TFC8.mos \
@@ -60,8 +62,7 @@ TT3.mos \
6062
# test that currently fail. Move up when fixed.
6163
# Run make testfailing
6264
FAILINGTESTFILES = \
63-
TFC5.mos \
64-
testAlgLoop7.mos \
65+
6566

6667

6768
# Dependency files that are not .mo .mos or Makefile

‎openmodelica/cruntime/optimization/basic/TFC5.mos‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,15 @@ getErrorString();
5252
res := OpenModelica.Scripting.compareSimulationResults("testFinalCon5__res.mat","ReferenceFiles/testFinalCon5_ref.mat","testFinalCon_diff.csv",0.01,0.0001); // Files not equal!!! Testing other convergence with solveLinearSystem
5353
getErrorString();
5454

55-
56-
5755
setCommandLineOptions("+maxSizeSolveLinearSystem=20"); getErrorString();
5856
echo(false);
59-
res := optimize(testFinalCon5, numberOfIntervals=700, tolerance = 1e-08, stopTime = 5, simflags="-lv LOG_IPOPT -optimizerNP 1");
57+
res := optimize(testFinalCon5, numberOfIntervals=700, tolerance = 1e-08, stopTime = 5, simflags="-lv LOG_IPOPT -optimizerNP 1 -iif ReferenceFiles/testFinalCon5_ref.mat -iim none -ipopt_init const");
6058
messages:=res.messages;
61-
echo(true);
59+
echo(false);
6260
res.resultFile;
6361
if regexBool(messages, "EXIT: Optimal Solution Found.") then
64-
if regexBool(messages, "Number of Iterations....: 40") then
65-
print("Number of Iterations....: 40\nEXIT: Optimal Solution Found.");
62+
if regexBool(messages, "Number of Iterations....: 91") then
63+
print("Number of Iterations....: 91\nEXIT: Optimal Solution Found.\n");
6664
else
6765
print("Number of Iterations changed.\tUpdate test\n");
6866
exit(1);
@@ -94,13 +92,6 @@ getErrorString();
9492
// "
9593
// true
9694
// ""
97-
// true
98-
// "testFinalCon5_res.mat"
99-
// Number of Iterations....: 40
95+
// Number of Iterations....: 91
10096
// EXIT: Optimal Solution Found.
101-
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
102-
// "
103-
// ""
104-
// {"Files Equal!"}
105-
// ""
10697
// endResult

‎openmodelica/cruntime/optimization/basic/testAlgLoop7.mos‎

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ end testAlgLoop7;
1818
");
1919
getErrorString();
2020

21-
optimize(testAlgLoop7, numberOfIntervals=100, tolerance = 1e-12, simflags="-lv LOG_IPOPT_ERROR -optimizerNP 1",stopTime=0.5);
21+
optimize(testAlgLoop7, numberOfIntervals=100, tolerance = 1e-12, simflags="-lv LOG_IPOPT_ERROR -optimizerNP 1 -iif ReferenceFiles/testAlgLoop7_ref.mat -iim none -ipopt_init FILE",stopTime=0.5);
2222
getErrorString();
2323

2424
res := OpenModelica.Scripting.compareSimulationResults("testAlgLoop7_res.mat","ReferenceFiles/testAlgLoop7_ref.mat","testFinalCon_diff.csv",0.01,0.0001);
@@ -31,51 +31,34 @@ getErrorString();
3131
// ""
3232
// record SimulationResult
3333
// resultFile = "testAlgLoop7_res.mat",
34-
// simulationOptions = "startTime = 0.0, stopTime = 0.5, numberOfIntervals = 100, tolerance = 1e-12, method = 'optimization', fileNamePrefix = 'testAlgLoop7', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-lv LOG_IPOPT_ERROR -optimizerNP 1'",
34+
// simulationOptions = "startTime = 0.0, stopTime = 0.5, numberOfIntervals = 100, tolerance = 1e-12, method = 'optimization', fileNamePrefix = 'testAlgLoop7', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-lv LOG_IPOPT_ERROR -optimizerNP 1 -iif ReferenceFiles/testAlgLoop7_ref.mat -iim none -ipopt_init FILE'",
3535
// messages = "
3636
// Optimizer Variables
3737
// ========================================================
3838
// State[0]:x1(start = 1, nominal = 2, min = -2, max = 2, init = 1)
3939
// State[1]:x2(start = -1, nominal = 2, min = -2, max = 2, init = -1)
40-
// Input[2]:OMC$Input2(start = 0, nominal = 1, min = -Inf, max = +Inf)
41-
// Input[3]:OMC$Input3(start = 0, nominal = 1, min = -Inf, max = +Inf)
42-
// Input[4]:u(start = 1, nominal = 1, min = -1, max = 1)
40+
// Input[2]:OMC$Input2(start = 3.10958, nominal = 4.10958, min = -Inf, max = +Inf)
41+
// Input[3]:OMC$Input3(start = -1.74447, nominal = 2.74447, min = -Inf, max = +Inf)
42+
// Input[4]:u(start = 0.864672, nominal = 1, min = -1, max = 1)
4343
// --------------------------------------------------------
4444
// number of nonlinear constraints: 3
4545
// ========================================================
46+
// stdout | info | Using values from file as initial guess.
4647
//
4748
// ******************************************************************************
4849
// This program contains Ipopt, a library for large-scale nonlinear optimization.
4950
// Ipopt is released as open source code under the Eclipse Public License (EPL).
5051
// For more information visit http://projects.coin-or.org/Ipopt
5152
// ******************************************************************************
5253
//
53-
// LOG_IPOPT_ERROR | info | max violation is 3 for the constraint $OMC$con$Loop$1(time = 0.005)
54-
// LOG_IPOPT_ERROR | info | max violation is 0.835916 for the constraint $OMC$con$Loop$1(time = 0.005)
55-
// LOG_IPOPT_ERROR | info | max violation is 0.386334 for the constraint $OMC$con$Loop$1(time = 0.005)
56-
// LOG_IPOPT_ERROR | info | max violation is 0.0942439 for the constraint $OMC$con$Loop$1(time = 0.005)
57-
// LOG_IPOPT_ERROR | info | max violation is 0.0199815 for the constraint $OMC$con$Loop$1(time = 0.005)
58-
// LOG_IPOPT_ERROR | info | max violation is 0.00278515 for the constraint $OMC$con$Loop$1(time = 0.005)
59-
// LOG_IPOPT_ERROR | info | max violation is 0.000762112 for the constraint $OMC$con$Loop$1(time = 0.12)
60-
// LOG_IPOPT_ERROR | info | max violation is 0.00712691 for the constraint $OMC$con$Loop$1(time = 0.12)
61-
// LOG_IPOPT_ERROR | info | max violation is 0.0651527 for the constraint $OMC$con$Loop$1(time = 0.125)
62-
// LOG_IPOPT_ERROR | info | max violation is 1.31204 for the constraint $OMC$con$Loop$1(time = 0.13)
63-
// LOG_IPOPT_ERROR | info | max violation is 0.268912 for the constraint $OMC$con$Loop$1(time = 0.13)
64-
// LOG_IPOPT_ERROR | info | max violation is 0.0840605 for the constraint $OMC$con$Loop$2(time = 0.135)
65-
// LOG_IPOPT_ERROR | info | max violation is 0.0417657 for the constraint $OMC$con$Loop$1(time = 0.155)
66-
// LOG_IPOPT_ERROR | info | max violation is 0.00668617 for the constraint $OMC$con$Loop$2(time = 0.16)
67-
// LOG_IPOPT_ERROR | info | max violation is 0.0424051 for the constraint $OMC$con$Loop$1(time = 0.165)
68-
// LOG_IPOPT_ERROR | info | max violation is 0.0577575 for the constraint $OMC$con$Loop$2(time = 0.335)
69-
// LOG_IPOPT_ERROR | info | max violation is 0.00818708 for the constraint $OMC$con$Loop$1(time = 0.165)
70-
// LOG_IPOPT_ERROR | info | max violation is 0.00415962 for the constraint $OMC$con$Loop$2(time = 0.165)
71-
// LOG_IPOPT_ERROR | info | max violation is 0.0106692 for the constraint $OMC$con$Loop$2(time = 0.435)
72-
// LOG_IPOPT_ERROR | info | max violation is 0.00303797 for the constraint $OMC$con$Loop$2(time = 0.45)
73-
// LOG_IPOPT_ERROR | info | max violation is 0.00162791 for the constraint $OMC$con$Loop$2(time = 0.445)
74-
// LOG_IPOPT_ERROR | info | max violation is 0.000598621 for the constraint $OMC$con$Loop$2(time = 0.445)
75-
// LOG_IPOPT_ERROR | info | max violation is 9.55782e-05 for the constraint $OMC$con$Loop$2(time = 0.445)
76-
// LOG_IPOPT_ERROR | info | max violation is 2.94449e-06 for the constraint $OMC$con$Loop$2(time = 0.445)
77-
// LOG_IPOPT_ERROR | info | max violation is 2.57394e-09 for the constraint $OMC$con$Loop$2(time = 0.445)
78-
// LOG_IPOPT_ERROR | info | max violation is 1.4988e-15 for the constraint $OMC$con$Loop$2(time = 0.445)
54+
// LOG_IPOPT_ERROR | info | max violation is 0.00630401 for the constraint $OMC$con$Loop$2(time = 0.17)
55+
// LOG_IPOPT_ERROR | info | max violation is 2.65142e-05 for the constraint $OMC$con$Loop$1(time = 0.17)
56+
// LOG_IPOPT_ERROR | info | max violation is 1.05717e-07 for the constraint $OMC$con$Loop$2(time = 0.17)
57+
// LOG_IPOPT_ERROR | info | max violation is 1.86696e-05 for the constraint $OMC$con$Loop$1(time = 0.17)
58+
// LOG_IPOPT_ERROR | info | max violation is 5.33144e-06 for the constraint $OMC$con$Loop$2(time = 0.435)
59+
// LOG_IPOPT_ERROR | info | max violation is 4.28851e-08 for the constraint $OMC$con$Loop$2(time = 0.435)
60+
// LOG_IPOPT_ERROR | info | max violation is 1.87112e-11 for the constraint $OMC$con$Loop$2(time = 0.445)
61+
// LOG_IPOPT_ERROR | info | max violation is 8.32667e-16 for the constraint $OMC$con$Loop$2(time = 0.165)
7962
// "
8063
// end SimulationResult;
8164
// ""

0 commit comments

Comments
 (0)