Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs
===================================================================
diff -u -r9fbd4c61f928385185c69004737130639e66b464 -r43ea9713b3b60bfb28ec520e5bf807634fffcbf1
--- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision 9fbd4c61f928385185c69004737130639e66b464)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision 43ea9713b3b60bfb28ec520e5bf807634fffcbf1)
@@ -73,7 +73,9 @@
/// The for which to validate the values.
/// true if has no validation errors; false otherwise.
/// Thrown when any parameter is null.
- public static bool Validate(ProbabilisticPipingCalculation calculation, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+ public static bool Validate(ProbabilisticPipingCalculation calculation,
+ PipingFailureMechanism failureMechanism,
+ IAssessmentSection assessmentSection)
{
if (calculation == null)
{
@@ -94,7 +96,7 @@
LogAnyWarnings(calculation);
- bool hasErrors = LogAnyErrors(calculation, failureMechanism.GeneralInput, assessmentSection, failureMechanism);
+ bool hasErrors = LogAnyErrors(calculation, failureMechanism, assessmentSection);
CalculationServiceHelper.LogValidationEnd();
@@ -446,9 +448,8 @@
}
private static bool LogAnyErrors(ProbabilisticPipingCalculation calculation,
- GeneralPipingInput generalInput,
- IAssessmentSection assessmentSection,
- PipingFailureMechanism failureMechanism)
+ PipingFailureMechanism failureMechanism,
+ IAssessmentSection assessmentSection)
{
string[] messages = ValidateHydraulicBoundaryDatabase(assessmentSection).ToArray();
@@ -458,7 +459,7 @@
return true;
}
- messages = ValidateInput(calculation.InputParameters, generalInput).ToArray();
+ messages = ValidateInput(calculation.InputParameters, failureMechanism.GeneralInput).ToArray();
if (messages.Length > 0)
{
Index: Riskeer/Piping/src/Riskeer.Piping.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r536a0319f5fae89ab806c0ebd1ad03eb9c0238e8 -r43ea9713b3b60bfb28ec520e5bf807634fffcbf1
--- Riskeer/Piping/src/Riskeer.Piping.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 536a0319f5fae89ab806c0ebd1ad03eb9c0238e8)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 43ea9713b3b60bfb28ec520e5bf807634fffcbf1)
@@ -272,7 +272,7 @@
}
///
- /// Looks up a localized string similar to Kan geen vak bepalen voor deze berekening..
+ /// Looks up a localized string similar to Kan geen vak bepalen voor deze berekening: de locatie van de profielschematisatie bevindt zich op de scheiding van twee vakken..
///
internal static string ProbabilisticPipingCalculationService_ValidateSections_Cannot_determine_section_for_calculation {
get {
Index: Riskeer/Piping/src/Riskeer.Piping.Service/Properties/Resources.resx
===================================================================
diff -u -r536a0319f5fae89ab806c0ebd1ad03eb9c0238e8 -r43ea9713b3b60bfb28ec520e5bf807634fffcbf1
--- Riskeer/Piping/src/Riskeer.Piping.Service/Properties/Resources.resx (.../Resources.resx) (revision 536a0319f5fae89ab806c0ebd1ad03eb9c0238e8)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Properties/Resources.resx (.../Resources.resx) (revision 43ea9713b3b60bfb28ec520e5bf807634fffcbf1)
@@ -191,6 +191,6 @@
Er is geen vakindeling geïmporteerd.
- Kan geen vak bepalen voor deze berekening.
+ Kan geen vak bepalen voor deze berekening: de locatie van de profielschematisatie bevindt zich op de scheiding van twee vakken.
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r9fbd4c61f928385185c69004737130639e66b464 -r43ea9713b3b60bfb28ec520e5bf807634fffcbf1
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 9fbd4c61f928385185c69004737130639e66b464)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 43ea9713b3b60bfb28ec520e5bf807634fffcbf1)
@@ -1042,7 +1042,7 @@
string[] msgs = messages.ToArray();
Assert.AreEqual(3, msgs.Length);
CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
- StringAssert.StartsWith("Kan geen vak bepalen voor deze berekening.", msgs[1]);
+ StringAssert.StartsWith("Kan geen vak bepalen voor deze berekening: de locatie van de profielschematisatie bevindt zich op de scheiding van twee vakken.", msgs[1]);
CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
});
Assert.IsFalse(isValid);