Add test for conflicting aliases and expected output

Belonging to [master]:
  - OpenModelica/OMCompiler#1985
  - OpenModelica/OpenModelica-testsuite#770

Author: ptaeuber

simulation/libraries/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestThreeWayValve.mos

@@ -28,11 +28,7 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
 // record SimulationResult
 //     resultFile = "ThermoSysPro.Examples.SimpleExamples.TestThreeWayValve_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1000.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ThermoSysPro.Examples.SimpleExamples.TestThreeWayValve', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | warning | While solving non-linear system an assertion failed during initialization.
-// |                 | |       | | The non-linear solver tries to solve the problem that could take some time.
-// |                 | |       | | It could help to provide better start-values for the iteration variables.
-// |                 | |       | | For more information simulate with -lv LOG_NLS
-// LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
+//     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "
 // end SimulationResult;

simulation/modelica/initialization/Makefile

@@ -77,6 +77,7 @@ OverdeterminedInitialization.Fluid.TwoVolumesFullInitial.mos \
 OverdeterminedInitialization.Fluid.TwoVolumesFullSteadyStatePressureAndTemperature.mos \
 redundantInitialEquations.mos \
 conflictingStartValues.mos \
+conflictingStartValues2.mos \
 
 # test that currently fail. Move up when fixed.
 # Run make failingtest

simulation/modelica/initialization/conflictingStartValues.mos

@@ -40,17 +40,17 @@ simulate(conflictingStartValues, stopTime=0.0, simflags="-output=x,a"); getError
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// "Warning: Alias set with conflicting start values having the same priority
-//  * Candidate: c(start = 10.0)
-//  * Candidate: b(start = p = 100.0)
-// => Select value from c(start = 10.0) for variable: a
+// "Warning: Alias set with conflicting start values
+//  * Candidate: c(start = 10.0, confidence number = 6)
+//  * Candidate: b(start = p = 100.0, confidence number = 1)
+// => Select value from b(start = p = 100.0) for variable: a
 // Warning: Alias set with conflicting nominal values
-//  * Candidate: b(nominal = 1000.0)
-//  * Candidate: a(nominal = 100.0)
+//  * Candidate: b(nominal = 1000.0, confidence number = 6)
+//  * Candidate: a(nominal = 100.0, confidence number = 6)
 // => Select value from a(nominal = 100.0) for variable: a
-// Warning: Alias set with conflicting start values having the same priority
-//  * Candidate: z(start = 4.0)
-//  * Candidate: y(start = 3.0)
-// => Select value from z(start = 4.0) for variable: x
+// Warning: Alias set with conflicting start values
+//  * Candidate: z(start = 4.0, confidence number = 6)
+//  * Candidate: y(start = 3.0, confidence number = 6)
+// => Select value from y(start = 3.0) for variable: x
 // "
 // endResult

simulation/modelica/initialization/conflictingStartValues2.mos

@@ -0,0 +1,68 @@
+// name:     conflictingStartValues2
+// keywords: initialization conflict
+// status: correct
+//
+// ticket:4329,4603
+
+loadString("
+model start
+  parameter Real s = 1;
+equation
+end start;
+
+model squared
+  Real x (start=Start.s);
+  Real y (start=10);
+  Real z (start=100);
+  start Start;
+equation
+  x*y = 9;
+  x = y;
+  x = z;
+end squared;
+
+model squared2
+  squared S (y(start=p2));
+  Real z;
+  parameter Real p2=3;
+equation
+  S.x + S.y = S.z + z;
+end squared2;
+
+function f
+  input Real x;
+  output Real y;
+algorithm
+  y := 3*x;
+end f;
+
+model conflictingStartValues2
+  squared2 S2 (S.z(start=f(p+p)));
+  parameter Real p=-0.5;
+equation
+end conflictingStartValues2;
+");getErrorString();
+
+setCommandLineOptions("-d=aliasConflicts"); getErrorString();
+simulate(conflictingStartValues2, stopTime=0.0, simflags="-output S2.S.x,S2.S.y,S2.S.z"); getErrorString();
+
+// Result:
+// true
+// ""
+// true
+// ""
+// record SimulationResult
+//     resultFile = "conflictingStartValues2_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 0.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'conflictingStartValues2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-output S2.S.x,S2.S.y,S2.S.z'",
+//     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
+// time=0,S2.S.x=-3,S2.S.y=-3,S2.S.z=-3
+// LOG_SUCCESS       | info    | The simulation finished successfully.
+// "
+// end SimulationResult;
+// "Warning: Alias set with conflicting start values
+//  * Candidate: S2.S.x(start = S2.S.Start.s = 1.0, confidence number = 3)
+//  * Candidate: S2.S.z(start = f(2.0 * p) = f(-1.0), confidence number = 1)
+//  * Candidate: S2.S.y(start = S2.p2 = 3.0, confidence number = 2)
+// => Select value from S2.S.z(start = f(2.0 * p) = f(-1.0)) for variable: S2.S.x
+// "
+// endResult