Skip to content

Commit

Permalink
compareSimulationResults is deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel @OpenModelica-Hudson
lochel authored and OpenModelica-Hudson committed Apr 9, 2017
1 parent ed5ccfb commit ff7789d
Show file tree
Hide file tree
Showing 129 changed files with 399 additions and 267 deletions.
3 changes: 2 additions & 1 deletion ...odelica/cppruntime/libraries/msl32/Modelica.Utilities.Examples.readRealParameterModel.mos
View file
Expand Up @@ -37,5 +37,6 @@ res := OpenModelica.Scripting.compareSimulationResults("Modelica.Utilities.Examp
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BR.mos
View file
Expand Up @@ -87,5 +87,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BRcon.mos
View file
Expand Up @@ -41,5 +41,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BRcon2.mos
View file
Expand Up @@ -57,5 +57,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BRcon3.mos
View file
Expand Up @@ -59,5 +59,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BRcon4.mos
View file
Expand Up @@ -63,5 +63,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BRcon5.mos
View file
Expand Up @@ -66,5 +66,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BReqcon.mos
View file
Expand Up @@ -57,5 +57,6 @@ getErrorString();
// "Warning: In component <NO COMPONENT>, in relation u == path_u, == on Real numbers is only allowed inside functions.
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/BRscale.mos
View file
Expand Up @@ -41,5 +41,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/CM.mos
View file
Expand Up @@ -54,5 +54,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/CM2.mos
View file
Expand Up @@ -56,5 +56,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/DM.mos
View file
Expand Up @@ -41,5 +41,6 @@ getErrorString();
// EXIT: Optimal Solution Found.
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/DMwarm.mos
View file
Expand Up @@ -58,5 +58,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/DMwarmCsv.mos
View file
Expand Up @@ -80,5 +80,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/LRB.mos
View file
Expand Up @@ -80,5 +80,6 @@ getErrorString();
// EXIT: Optimal Solution Found.
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/LRB2.mos
View file
Expand Up @@ -85,5 +85,6 @@ getErrorString();
// EXIT: Optimal Solution Found.
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
15 changes: 10 additions & 5 deletions openmodelica/cruntime/optimization/basic/LV.mos
View file
Expand Up @@ -212,7 +212,8 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// record SimulationResult
// resultFile = "optLotkaVolterra2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 70, tolerance = 1e-08, method = 'optimization', fileNamePrefix = 'optLotkaVolterra2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
Expand All @@ -238,7 +239,8 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// record SimulationResult
// resultFile = "optLotkaVolterra3_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 70, tolerance = 1e-08, method = 'optimization', fileNamePrefix = 'optLotkaVolterra3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
Expand All @@ -264,7 +266,8 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// record SimulationResult
// resultFile = "optLotkaVolterra4_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 70, tolerance = 1e-08, method = 'optimization', fileNamePrefix = 'optLotkaVolterra4', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
Expand All @@ -290,7 +293,8 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// record SimulationResult
// resultFile = "optLotkaVolterra5_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 70, tolerance = 1e-08, method = 'optimization', fileNamePrefix = 'optLotkaVolterra5', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
Expand All @@ -316,5 +320,6 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/LoopTest.mos
View file
Expand Up @@ -47,5 +47,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/NP.mos
View file
Expand Up @@ -60,5 +60,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/OSP.mos
View file
Expand Up @@ -43,5 +43,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/SC.mos
View file
Expand Up @@ -48,5 +48,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TFC.mos
View file
Expand Up @@ -59,5 +59,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TFC2.mos
View file
Expand Up @@ -61,5 +61,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TFC3.mos
View file
Expand Up @@ -63,5 +63,6 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TFC4.mos
View file
Expand Up @@ -67,5 +67,6 @@ getErrorString();
// 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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TFC5.mos
View file
Expand Up @@ -88,7 +88,8 @@ getErrorString();
// "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").
// "
// {"Files not Equal!","y2","y1","x2","x1","u","final_con2","final_con1","der(x2)","der(x1)","cost"}
// "Warning: Files not Equal
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// Warning: Files not Equal
// "
// true
// ""
Expand Down
7 changes: 4 additions & 3 deletions openmodelica/cruntime/optimization/basic/TFC6.mos
View file
Expand Up @@ -57,8 +57,8 @@ getErrorString();
// messages = "LOG_LS | info | initialize linear system solvers
// | | | | | 1 linear systems
// LOG_LS | info | Start solving Linear System 9 (size 1) at time 0 with Lapack Solver
// LOG_LS | info | ### 0.000014 time to set Matrix A and vector b.
// LOG_LS | info | Solve System: 0.000047
// LOG_LS | info | ### 0.000020 time to set Matrix A and vector b.
// LOG_LS | info | Solve System: 0.000041
//
// Optimizer Variables
// ========================================================
Expand Down Expand Up @@ -445,5 +445,6 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
7 changes: 4 additions & 3 deletions openmodelica/cruntime/optimization/basic/TFC7.mos
View file
Expand Up @@ -62,16 +62,17 @@ getErrorString();
//
// LOG_IPOPT_ERROR | info | max violation is 3.25 for the final constraint $finalCon$final_con2(time = 5)
// LOG_IPOPT_ERROR | info | max error is 0.136064 for the approximation of the state x1(time = 3.7)
// LOG_IPOPT_ERROR | info | max error is 0.00651595 for the approximation of the state x1(time = 4.5)
// LOG_IPOPT_ERROR | info | max error is 0.00651596 for the approximation of the state x1(time = 4.5)
// LOG_IPOPT_ERROR | info | max error is 0.00103252 for the approximation of the state x1(time = 4.5)
// LOG_IPOPT_ERROR | info | max error is 2.32683e-05 for the approximation of the state x1(time = 4.5)
// LOG_IPOPT_ERROR | info | max violation is 1.81419e-08 for the final constraint $finalCon$final_con2(time = 5)
// LOG_IPOPT_ERROR | info | max violation is 1.81421e-08 for the final constraint $finalCon$final_con2(time = 5)
// LOG_IPOPT_ERROR | info | max violation is 4.99294e-08 for the final constraint $finalCon$final_con2(time = 5)
// "
// end SimulationResult;
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
7 changes: 4 additions & 3 deletions openmodelica/cruntime/optimization/basic/TFC8.mos
View file
Expand Up @@ -69,15 +69,16 @@ getErrorString();
// LOG_IPOPT_ERROR | info | max error is 2.09989 for the approximation of the state x1(time = 5)
// LOG_IPOPT_ERROR | info | max error is 0.309263 for the approximation of the state x1(time = 5)
// LOG_IPOPT_ERROR | info | max error is 0.0557617 for the approximation of the state x1(time = 4.32669)
// LOG_IPOPT_ERROR | info | max error is 0.00985499 for the approximation of the state x1(time = 5)
// LOG_IPOPT_ERROR | info | max error is 0.009855 for the approximation of the state x1(time = 5)
// LOG_IPOPT_ERROR | info | max error is 0.000186212 for the approximation of the state x1(time = 4.32669)
// LOG_IPOPT_ERROR | info | max error is 1.28521e-07 for the approximation of the state x1(time = 4.32669)
// LOG_IPOPT_ERROR | info | max error is 1.28519e-07 for the approximation of the state x1(time = 4.32669)
// LOG_IPOPT_ERROR | info | max violation is 4.99295e-08 for the final constraint $finalCon$final_con2(time = 5)
// "
// end SimulationResult;
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TFCtestFlag.mos
View file
Expand Up @@ -59,5 +59,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TT.mos
View file
Expand Up @@ -56,5 +56,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TT2.mos
View file
Expand Up @@ -57,5 +57,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/TT3.mos
View file
Expand Up @@ -57,5 +57,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/VDP.mos
View file
Expand Up @@ -42,5 +42,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
8 changes: 5 additions & 3 deletions openmodelica/cruntime/optimization/basic/reduce1.mos
View file
Expand Up @@ -86,7 +86,8 @@ getErrorString();
// "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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// true
// ""
// record SimulationResult
Expand Down Expand Up @@ -123,9 +124,10 @@ getErrorString();
// LOG_IPOPT_ERROR | info | max error is 1.02648e-09 for the approximation of the state y(time = 1)
// "
// end SimulationResult;
// "Warning: Deprecated debug flag --d=reduceDynOpt detected. Use --postOptModules+=reduceDynamicOptimization instead.
// "Warning: Deprecated debug flag -d=reduceDynOpt detected. Use --postOptModules+=reduceDynamicOptimization instead.
// 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").
// "
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/testAlgLoop1.mos
View file
Expand Up @@ -57,5 +57,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/testAlgLoop10.mos
View file
Expand Up @@ -52,5 +52,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult
3 changes: 2 additions & 1 deletion openmodelica/cruntime/optimization/basic/testAlgLoop11.mos
View file
Expand Up @@ -54,5 +54,6 @@ getErrorString();
// end SimulationResult;
// ""
// {"Files Equal!"}
// ""
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
// "
// endResult

0 comments on commit ff7789d

Please sign in to comment.