fixed 3437:

 - compare only optimization variables
 - added bounds for der(evaporator.V_v)
 - changed simulation falgs (init push, mu-strategy)

updated expected output
-using regex

Author: vruge

openmodelica/cruntime/optimization/benchmark/DrumBoiler.mo

@@ -144,7 +144,10 @@ package drumBoiler
     drumBoiler.optimizationFormulation.ObjectFunction.Minimize cost_qm_S(u = (qm_S - 180) ^ 2, gain = 1e-4);
     drumBoiler.optimizationFormulation.Constraints.Band conSigma(MaxValue = 150, MinValue = -150, u = (-1.0e3 * der(evaporator.T_D)) + 1.0e-05 * evaporator.p);
     input Real dq_F(min = -25 / 60, max = 25 / 60, start = 0.1);
+	Real der_V_v(min = -0.02, max =0.025) = der(evaporator.V_v);
+	//Real der_evaporator_p(min=0, max=3.2e4) = der(evaporator.p);
   equation
+  
     der(q_F) = dq_F;
     annotation(experiment(StopTime = 3600, Tolerance = 1e-5));
   end optDrumBoiler;

openmodelica/cruntime/optimization/benchmark/Makefile

@@ -2,14 +2,15 @@ TEST = ../../../../rtest -v
 
 
 TESTFILES = \
+runDrumBoiler.mos \
+runExReduceDrumBoiler.mos \
 runReduceDrumBoiler.mos
 
 
 # test that currently fail. Move up when fixed. 
 # Run make testfailing
 FAILINGTESTFILES = \
-runDrumBoiler.mos \
-runExReduceDrumBoiler.mos \
+
 
 
 # Dependency files that are not .mo .mos or Makefile

openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos

@@ -13,7 +13,17 @@ getErrorString();
 optimize(drumBoiler.optDrumBoiler, stopTime=3600, numberOfIntervals=50, tolerance=1e-4,simflags="-lv=LOG_IPOPT_ERROR -optimizerNP 1 -s optimization");
 getErrorString();
 
-res := OpenModelica.Scripting.compareSimulationResults("drumBoiler.optDrumBoiler_res.mat","ReferenceFiles/drumBoiler.optDrumBoiler_ref.mat","drumBoiler.optDrumBoiler_res.csv",0.01,0.0001);
+res := OpenModelica.Scripting.compareSimulationResults("drumBoiler.optDrumBoiler_res.mat","ReferenceFiles/drumBoiler.optDrumBoiler_ref.mat","drumBoiler.optDrumBoiler_res.csv",0.01,0.0001,
+{
+"dq_F",
+"Y_Valve",
+"q_F",
+"controller.x",
+"cost_q_S.u",
+"cost_qm_S.u",
+"conSigma.u",
+"dq_F"
+});
 getErrorString();
 
 // Result:
@@ -31,20 +41,20 @@ getErrorString();
 // ========================================================
 // State[0]:controller.x(start = 0, nominal = 10, min = -Inf, max = +Inf, init = 0)
 // State[1]:evaporator.V_l(start = 67, nominal = 68, min = -Inf, max = +Inf, init = 67)
-// State[2]:evaporator.p(start = 100000, nominal = 1e+06, min = 611.657, max = 1e+08, init = 100000)
+// State[2]:evaporator.p(start = 100000, nominal = 1e+006, min = 611.657, max = 1e+008, init = 100000)
 // State[3]:q_F(start = 0, nominal = 400, min = 0, max = 500, init = 0)
 // Input[4]:Y_Valve(start = 0.5, nominal = 1, min = 0, max = 1)
 // Input[5]:dq_F(start = 0.1, nominal = 0.416667, min = -0.416667, max = 0.416667)
 // --------------------------------------------------------
 // number of nonlinear constraints: 1
 // ========================================================
-//
+// 
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.
 //  Ipopt is released as open source code under the Eclipse Public License (EPL).
 //          For more information visit http://projects.coin-or.org/Ipopt
 // ******************************************************************************
-//
+// 
 // LOG_IPOPT_ERROR   | info    | max violation is 2.49596 for the constraint $OMC$constarintTerm1(time = 936)
 // LOG_IPOPT_ERROR   | info    | max violation is 214.785 for the constraint $OMC$constarintTerm1(time = 1368)
 // LOG_IPOPT_ERROR   | info    | max violation is 214.653 for the constraint $OMC$constarintTerm1(time = 1368)
@@ -72,5 +82,5 @@ getErrorString();
 // end SimulationResult;
 // ""
 // {"Files Equal!"}
-// "
+// ""
 // endResult